Skip to content

Commit 7d4273c

Browse files
committed
Auto merge of #2147 - rust-lang:dependabot/npm_and_yarn/ember-concurrency-1.1.5, r=jtgeibel
Bump ember-concurrency from 1.1.4 to 1.1.5 Bumps [ember-concurrency](https://github.com/machty/ember-concurrency) from 1.1.4 to 1.1.5. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/machty/ember-concurrency/releases">ember-concurrency's releases</a>.</em></p> <blockquote> <h2>1.1.5</h2> <h3>Bugfixes</h3> <ul> <li>Avoid auto-tracking rerender assertion / infinite rerender during cancellation in certain contexts in Ember 3.15+ (<a href="https://github-redirect.dependabot.com/machty/ember-concurrency/issues/341">#341</a>, Fixes <a href="https://github-redirect.dependabot.com/machty/ember-concurrency/issues/340">#340</a>)</li> </ul> </blockquote> </details> <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/machty/ember-concurrency/blob/master/CHANGELOG.md">ember-concurrency's changelog</a>.</em></p> <blockquote> <h3>1.1.5</h3> <ul> <li>Avoid auto-tracking rerender assertion / infinite rerender during cancelation in certain contexts in Ember 3.15+ (<a href="https://github-redirect.dependabot.com/machty/ember-concurrency/issues/341">#341</a>, Fixes <a href="https://github-redirect.dependabot.com/machty/ember-concurrency/issues/340">#340</a>)</li> </ul> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/machty/ember-concurrency/commit/172a56d9622663d993627d3914d749f0779851b9"><code>172a56d</code></a> Release 1.1.5</li> <li><a href="https://github.com/machty/ember-concurrency/commit/7081129b1f12266c3e4b0d6fb0c9e89fad438e23"><code>7081129</code></a> Add changelog entry for 1.1.5</li> <li><a href="https://github.com/machty/ember-concurrency/commit/153eb1fb85008bdbd2b644ed7e591553eba00d43"><code>153eb1f</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/machty/ember-concurrency/issues/341">#341</a> from machty/mf-remove_accidental_autotracking</li> <li><a href="https://github.com/machty/ember-concurrency/commit/b5decf682ced0b1c2739f5b27e62b666ccb8f146"><code>b5decf6</code></a> Add test for rerender assertion during task cancelation</li> <li><a href="https://github.com/machty/ember-concurrency/commit/377506806c4f9c78df942842e78b7aaf583935c4"><code>3775068</code></a> Remove uses of get() internally that could result in auto-tracking and rerend...</li> <li>See full diff in <a href="https://github.com/machty/ember-concurrency/compare/1.1.4...1.1.5">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=ember-concurrency&package-manager=npm_and_yarn&previous-version=1.1.4&new-version=1.1.5)](https://dependabot.com/compatibility-score.html?dependency-name=ember-concurrency&package-manager=npm_and_yarn&previous-version=1.1.4&new-version=1.1.5) 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-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> 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 badge me` will comment on this PR with code to add a "Dependabot enabled" badge to your readme Additionally, you can set the following in the `.dependabot/config.yml` file in this repo: - Update frequency - Automerge options (never/patch/minor, and dev/runtime dependencies) - Out-of-range updates (receive only lockfile updates, if desired) - Security updates (receive only security updates, if desired) </details>
2 parents 3c176a7 + ab712a9 commit 7d4273c

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
"ember-cli-sass": "^10.0.1",
5252
"ember-cli-sri": "2.1.1",
5353
"ember-cli-uglify": "^3.0.0",
54-
"ember-concurrency": "^1.1.4",
54+
"ember-concurrency": "^1.1.5",
5555
"ember-css-modules": "^1.3.0-beta.1",
5656
"ember-css-modules-sass": "^1.0.1",
5757
"ember-data": "~3.15.0",

0 commit comments

Comments
 (0)