Bump sinon from 13.0.1 to 14.0.0
Bumps sinon from 13.0.1 to 14.0.0.
Changelog
Sourced from sinon's changelog.
14.0.0
c2bbd826Drop node 12 (Morgan Roderick)And embrace Node 18
Released by Morgan Roderick on 2022-05-07.
13.0.2
bddb631aUpdate fake-timers (Carl-Erik Kopseng)eaed0eb2Bump nokogiri from 1.13.3 to 1.13.4 (#2451) (dependabot[bot])Released by Carl-Erik Kopseng on 2022-04-14.
Commits
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)
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/sinon-14.0.0 with contents from dependabot/npm_and_yarn/development/7.4/sinon-14.0.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/sinon-14.0.0 origin/development/7.10
$ git merge origin/dependabot/npm_and_yarn/development/7.4/sinon-14.0.0
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/7.10/dependabot/npm_and_yarn/development/7.4/sinon-14.0.0
The following options are set: bypass_author_approval, bypass_jira_check
Superseded by #4823.