-
Notifications
You must be signed in to change notification settings - Fork 20
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
build(deps): Bump node-forge from 0.7.6 to 0.10.0 #1258
build(deps): Bump node-forge from 0.7.6 to 0.10.0 #1258
Conversation
Hello dependabot[bot],My role is to assist you with the merge of this Status report is not available. |
ConflictA conflict has been raised during the creation of I have not created the integration branch. Here are the steps to resolve this conflict: $ git fetch
$ git checkout -B w/7.8/dependabot/npm_and_yarn/development/7.4/node-forge-0.10.0 origin/development/7.8
$ git merge origin/dependabot/npm_and_yarn/development/7.4/node-forge-0.10.0
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/7.8/dependabot/npm_and_yarn/development/7.4/node-forge-0.10.0 |
ConflictThere is a conflict between your branch Please resolve the conflict on the feature branch ( $ git fetch
$ git checkout origin/dependabot/npm_and_yarn/development/7.4/node-forge-0.10.0
$ git merge origin/development/7.4
$ # <intense conflict resolution>
$ git commit
$ git push origin HEAD:dependabot/npm_and_yarn/development/7.4/node-forge-0.10.0 |
Bumps [node-forge](https://github.com/digitalbazaar/forge) from 0.7.6 to 0.10.0. - [Release notes](https://github.com/digitalbazaar/forge/releases) - [Changelog](https://github.com/digitalbazaar/forge/blob/master/CHANGELOG.md) - [Commits](digitalbazaar/forge@0.7.6...0.10.0) Signed-off-by: dependabot[bot] <[email protected]>
17dd938
to
6cd9ed1
Compare
ConflictA conflict has been raised during the creation of 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/node-forge-0.10.0 origin/development/7.10
$ git merge origin/dependabot/npm_and_yarn/development/7.4/node-forge-0.10.0
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/7.10/dependabot/npm_and_yarn/development/7.4/node-forge-0.10.0 |
OK, I won't notify you again about this release, but will get in touch when a new version is available. If you change your mind, just re-open this PR and I'll resolve any conflicts on it. |
Bumps node-forge from 0.7.6 to 0.10.0.
Changelog
Sourced from node-forge's changelog.
Commits
8018c3e
Release 0.10.0.6a1e3ef
Remove object path functions.30d560c
Remove Node.js 4 support.1ba83ec
Update dependencies.81abd87
Improve linting.7b59028
Test on Node.js 14.ba13a1c
Update webpack.c8d5395
Add travis browser test names.afc5a72
Update dependencies.ba0207f
Test on Node.js 12.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 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)