cloudserver icon indicating copy to clipboard operation
cloudserver copied to clipboard

Bump sinon from 13.0.1 to 14.0.0

Open dependabot[bot] opened this issue 3 years ago • 2 comments

Bumps sinon from 13.0.1 to 14.0.0.

Changelog

Sourced from sinon's changelog.

14.0.0

Released by Morgan Roderick on 2022-05-07.

13.0.2

  • bddb631a Update fake-timers (Carl-Erik Kopseng)
  • eaed0eb2 Bump nokogiri from 1.13.3 to 1.13.4 (#2451) (dependabot[bot])

Released by Carl-Erik Kopseng on 2022-04-14.

Commits

Dependabot compatibility score

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)

dependabot[bot] avatar May 09 '22 13:05 dependabot[bot]

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

bert-e avatar May 09 '22 13:05 bert-e

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

bert-e avatar May 09 '22 13:05 bert-e

Superseded by #4823.

dependabot[bot] avatar Oct 04 '22 13:10 dependabot[bot]