scality
build(deps-dev): bump eslint-config-scality from 7.4.11 to 8.2.0
Bumps eslint-config-scality from 7.4.11 to 8.2.0.
Commits
8147a6bMerge branch 'w/7.10/improvement/GDL-5-versions' into tmp/octopus/w/8.2/impro...de5b316Merge remote-tracking branch 'origin/improvement/GDL-5-versions' into w/7.10/...a801c30Merge remote-tracking branch 'origin/feature/GDL-5-bump-7-10' into w/8.2/feat...20eaeb3GDL-5 bump version for 7.10.2909b8b7improvement: GDL-5 update yarn.lock4ba70e3Merge branch 'w/8.1/improvement/GDL-5-node-16-upgrade' into tmp/octopus/w/8.2...27dc037Merge remote-tracking branch 'origin/w/8.0/improvement/GDL-5-node-16-upgrade'...94a67a2Merge branch 'w/7.10/improvement/GDL-5-node-16-upgrade' into tmp/octopus/w/8....310abb0Merge branch 'w/8.1/improvement/GDL-5-revert-node-16-upgrade' into tmp/octopu...3797945improvement: GDL-5 linter corrections- Additional commits viewable in compare view
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 commands and options
You can trigger Dependabot actions by commenting on this PR:
-
@dependabot rebasewill rebase this PR -
@dependabot recreatewill recreate this PR, overwriting any edits that have been made to it -
@dependabot mergewill merge this PR after your CI passes on it -
@dependabot squash and mergewill squash and merge this PR after your CI passes on it -
@dependabot cancel mergewill cancel a previously requested merge and block automerging -
@dependabot reopenwill reopen this PR if it is closed -
@dependabot closewill close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually -
@dependabot ignore this major versionwill 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 versionwill 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 dependencywill close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
![dependabot[bot] avatar](https://avatars.githubusercontent.com/in/29110?v=4 "Published by a pub.dev verified publisher"){kind=small}
Hello dependabot[bot],
My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.
Status report is not available.
The following options are set: bypass_author_approval, bypass_jira_check
Conflict
A conflict has been raised during the creation of
integration branch w/7.10/dependabot/npm_and_yarn/development/7.4/eslint-config-scality-8.2.0 with contents from dependabot/npm_and_yarn/development/7.4/eslint-config-scality-8.2.0
and development/7.10.
I have not created the integration branch.
Here are the steps to resolve this conflict:
$ git fetch
$ git checkout -B w/7.10/dependabot/npm_and_yarn/development/7.4/eslint-config-scality-8.2.0 origin/development/7.10
$ git merge origin/dependabot/npm_and_yarn/development/7.4/eslint-config-scality-8.2.0
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/7.10/dependabot/npm_and_yarn/development/7.4/eslint-config-scality-8.2.0
The following options are set: bypass_author_approval, bypass_jira_check
OK, I won't notify you again about this release, but will get in touch when a new version is available. You can also ignore all major, minor, or patch releases for a dependency by adding an ignore condition with the desired update_types to your config file.
If you change your mind, just re-open this PR and I'll resolve any conflicts on it.