Skip to content

Update dependency eslint to v7.16.0 #3103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 19, 2020
Merged

Update dependency eslint to v7.16.0 #3103

merged 1 commit into from
Dec 19, 2020

Conversation

renovate[bot]
Copy link
Contributor

@renovate renovate bot commented Dec 18, 2020

WhiteSource Renovate

This PR contains the following updates:

Package Change Age Adoption Passing Confidence
eslint (source) 7.15.0 -> 7.16.0 age adoption passing confidence

Release Notes

eslint/eslint

v7.16.0

Compare Source

  • a62ad6f Update: fix false negative of no-extra-parens with NewExpression (#​13930) (Milos Djermanovic)
  • f85b4c7 Fix: require-atomic-updates false positive across await (fixes #​11954) (#​13915) (buhi)
  • 301d0c0 Fix: no-constant-condition false positives with unary expressions (#​13927) (Milos Djermanovic)
  • 555c128 Fix: false positive with await and ** in no-extra-parens (fixes #​12739) (#​13923) (Milos Djermanovic)
  • d93c935 Docs: update JSON Schema links (#​13936) (Milos Djermanovic)
  • 8d0c93a Upgrade: table@6.0.4 (#​13920) (Rouven Weßling)
  • 9247683 Docs: Remove for deleted npm run profile script (#​13931) (Brandon Mills)
  • ab240d4 Fix: prefer-exponentiation-operator invalid autofix with await (#​13924) (Milos Djermanovic)
  • dc76911 Chore: Add .pre-commit-hooks.yaml file (#​13628) (Álvaro Mondéjar)
  • 2124e1b Docs: Fix wrong rule name (#​13913) (noisyboy25)
  • 06b5809 Sponsors: Sync README with website (ESLint Jenkins)
  • 26fc12f Docs: Update README team and sponsors (ESLint Jenkins)

Renovate configuration

📅 Schedule: At any time (no schedule defined).

🚦 Automerge: Disabled by config. Please merge this manually once you are satisfied.

♻️ Rebasing: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 Ignore: Close this PR and you won't be reminded about this update again.


  • If you want to rebase/retry this PR, check this box

This PR has been generated by WhiteSource Renovate. View repository job log here.

@rust-highfive
Copy link

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @smarnach (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@Turbo87
Copy link
Member

Turbo87 commented Dec 19, 2020

@bors r+

@bors
Copy link
Contributor

bors commented Dec 19, 2020

📌 Commit 700c5c9 has been approved by Turbo87

@bors
Copy link
Contributor

bors commented Dec 19, 2020

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

  1. git checkout renovate/eslint-7.x (switch to your branch)
  2. git fetch upstream master (retrieve the latest master)
  3. git rebase upstream/master -p (rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self renovate/eslint-7.x --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message
Auto-merging yarn.lock
Auto-merging package.json
CONFLICT (content): Merge conflict in package.json
Automatic merge failed; fix conflicts and then commit the result.

@bors
Copy link
Contributor

bors commented Dec 19, 2020

☔ The latest upstream changes (presumably #3104) made this pull request unmergeable. Please resolve the merge conflicts.

Note that reviewers usually do not review pull requests until merge conflicts are resolved! Once you resolve the conflicts, you should change the labels applied by bors to indicate that your PR is ready for review. Post this as a comment to change the labels:

@rustbot modify labels: +S-waiting-on-review -S-waiting-on-author

@renovate renovate bot force-pushed the renovate/eslint-7.x branch from 700c5c9 to 788c615 Compare December 19, 2020 08:36
@Turbo87
Copy link
Member

Turbo87 commented Dec 19, 2020

@bors r+

@bors
Copy link
Contributor

bors commented Dec 19, 2020

📌 Commit 788c615 has been approved by Turbo87

@bors
Copy link
Contributor

bors commented Dec 19, 2020

⌛ Testing commit 788c615 with merge aa6a73a...

@bors
Copy link
Contributor

bors commented Dec 19, 2020

☀️ Test successful - checks-actions
Approved by: Turbo87
Pushing aa6a73a to master...

@bors bors merged commit aa6a73a into master Dec 19, 2020
@renovate renovate bot deleted the renovate/eslint-7.x branch December 19, 2020 08:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants