Skip to content

Commit 56a52ce

Browse files
committed
Auto merge of #2670 - rust-lang:dependabot/npm_and_yarn/eslint-7.6.0, r=Turbo87
Bump eslint from 7.5.0 to 7.6.0 Bumps [eslint](https://github.com/eslint/eslint) from 7.5.0 to 7.6.0. <br /> [![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=eslint&package-manager=npm_and_yarn&previous-version=7.5.0&new-version=7.6.0)](https://dependabot.com/compatibility-score/?dependency-name=eslint&package-manager=npm_and_yarn&previous-version=7.5.0&new-version=7.6.0) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) - `@dependabot badge me` will comment on this PR with code to add a "Dependabot enabled" badge to your readme Additionally, you can set the following in the `.dependabot/config.yml` file in this repo: - Update frequency - Automerge options (never/patch/minor, and dev/runtime dependencies) - Out-of-range updates (receive only lockfile updates, if desired) - Security updates (receive only security updates, if desired) </details>
2 parents 45ddec4 + 3ec76a7 commit 56a52ce

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

package-lock.json

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
"ember-truth-helpers": "^2.1.0",
9595
"ember-web-app": "^4.0.0",
9696
"ember-window-mock": "^0.7.1",
97-
"eslint": "^7.5.0",
97+
"eslint": "^7.6.0",
9898
"eslint-config-prettier": "^6.11.0",
9999
"eslint-plugin-ember": "^8.9.2",
100100
"eslint-plugin-import-helpers": "^1.1.0",

0 commit comments

Comments
 (0)