Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/npm_and_yarn/gatsby-plugin-offl…
Browse files Browse the repository at this point in the history
…ine-4.0.0
  • Loading branch information
ADMARIl authored Mar 13, 2021
2 parents 25e830f + ced3141 commit 81b5180
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 8 deletions.
8 changes: 8 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
version: 2
updates:
- package-ecosystem: npm
directory: "/"
schedule:
interval: daily
time: "10:00"
open-pull-requests-limit: 10
16 changes: 16 additions & 0 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
pull_request_rules:
- name: Automatic merge on approval
conditions:
- "#approved-reviews-by>=1"
actions:
merge:
method: merge

- name: Automatic merge if dependency bump
conditions:
- author~=^dependabot(|-preview)\[bot\]$
- check-success=Sider
- check-success=Vercel
actions:
merge:
method: merge
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,22 +38,22 @@
"animejs": "^3.1.0",
"babel-plugin-styled-components": "^1.10.6",
"gatsby": "^2.18.7",
"gatsby-image": "^2.2.34",
"gatsby-image": "^3.0.0",
"gatsby-plugin-dark-mode": "^1.1.0",
"gatsby-plugin-google-analytics": "^2.1.29",
"gatsby-plugin-manifest": "^2.2.31",
"gatsby-plugin-netlify": "^2.1.27",
"gatsby-plugin-offline": "^4.0.0",
"gatsby-plugin-react-helmet": "^3.1.16",
"gatsby-plugin-manifest": "^3.0.0",
"gatsby-plugin-netlify": "^3.0.0",
"gatsby-plugin-react-helmet": "^4.0.0",
"gatsby-plugin-robots-txt": "^1.5.0",
"gatsby-plugin-sharp": "^2.3.5",
"gatsby-plugin-sitemap": "^2.2.22",
"gatsby-plugin-sitemap": "^3.0.0",
"gatsby-plugin-styled-components": "^3.1.14",
"gatsby-remark-external-links": "0.0.4",
"gatsby-remark-images": "^3.1.35",
"gatsby-remark-images": "^4.0.0",
"gatsby-remark-prismjs": "^3.3.25",
"gatsby-source-filesystem": "^2.1.40",
"gatsby-transformer-remark": "^2.6.39",
"gatsby-transformer-remark": "^3.0.0",
"gatsby-transformer-sharp": "^2.3.7",
"lodash": "^4.17.15",
"prismjs": "^1.17.1",
Expand All @@ -75,7 +75,7 @@
"eslint-plugin-jsx-a11y": "^6.2.3",
"eslint-plugin-react": "^7.17.0",
"gatsby-remark-code-titles": "^1.1.0",
"husky": "^4.2.3",
"husky": "^5.1.3",
"lint-staged": "^10.5.1",
"prettier": "^2.1.2"
}
Expand Down

0 comments on commit 81b5180

Please sign in to comment.