Commit f0891e1
committed
minor #6932 Bump trix from 2.1.12 to 2.1.15 (dependabot[bot])
This PR was merged into the 4.x branch.
Discussion
----------
Bump trix from 2.1.12 to 2.1.15
Bumps [trix](https://github.com/basecamp/trix) from 2.1.12 to 2.1.15.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/basecamp/trix/releases">trix's releases</a>.</em></p>
<blockquote>
<h2>v2.1.15</h2>
<p><strong>Full Changelog</strong>: <a href="https://github.com/basecamp/trix/compare/v2.1.14...v2.1.15">https://github.com/basecamp/trix/compare/v2.1.14...v2.1.15</a></p>
<p>Fixes <a href="https://github.com/basecamp/trix/security/advisories/GHSA-mcrw-746g-9q8h">https://github.com/basecamp/trix/security/advisories/GHSA-mcrw-746g-9q8h</a></p>
<h2>v2.1.14</h2>
<h2>What's Changed</h2>
<ul>
<li>Bump dompurify to 3.2.5 to resolve security issue by <a href="https://github.com/jakeonrails"><code>@jakeonrails</code></a> in <a href="https://redirect.github.com/basecamp/trix/pull/1232">basecamp/trix#1232</a></li>
</ul>
<h2>New Contributors</h2>
<ul>
<li><a href="https://github.com/jakeonrails"><code>@jakeonrails</code></a> made their first contribution in <a href="https://redirect.github.com/basecamp/trix/pull/1232">basecamp/trix#1232</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a href="https://github.com/basecamp/trix/compare/v2.1.13...v2.1.14">https://github.com/basecamp/trix/compare/v2.1.13...v2.1.14</a></p>
<h2>v2.1.13</h2>
<h2>What's Changed</h2>
<ul>
<li>Add test coverage for CSP-<code><style></code> integration by <a href="https://github.com/seanpdoyle"><code>@seanpdoyle</code></a> in <a href="https://redirect.github.com/basecamp/trix/pull/1199">basecamp/trix#1199</a></li>
<li>Correct a weird sentence in README.md by <a href="https://github.com/Uaitt"><code>@Uaitt</code></a> in <a href="https://redirect.github.com/basecamp/trix/pull/1220">basecamp/trix#1220</a></li>
<li>Make Trix compatible with morphing by <a href="https://github.com/jorgemanrubia"><code>@jorgemanrubia</code></a> in <a href="https://redirect.github.com/basecamp/trix/pull/1227">basecamp/trix#1227</a></li>
</ul>
<h2>New Contributors</h2>
<ul>
<li><a href="https://github.com/Uaitt"><code>@Uaitt</code></a> made their first contribution in <a href="https://redirect.github.com/basecamp/trix/pull/1220">basecamp/trix#1220</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a href="https://github.com/basecamp/trix/compare/v2.1.12...v2.1.13">https://github.com/basecamp/trix/compare/v2.1.12...v2.1.13</a></p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/basecamp/trix/commit/5f8d56dca618d6f51d9b86f5983c3490dd6588ea"><code>5f8d56d</code></a> v2.1.15</li>
<li><a href="https://github.com/basecamp/trix/commit/75226089646841b0f774d8b152e5ec27d2d9e191"><code>7522608</code></a> Merge commit from fork</li>
<li><a href="https://github.com/basecamp/trix/commit/5f61df05e66196b9f72d2d5308a1dc2fca33a29b"><code>5f61df0</code></a> Use SAFE_FOR_XML for pasted content</li>
<li><a href="https://github.com/basecamp/trix/commit/2d72f93ed52ff0159f65f86bd8f5e0f64e66b486"><code>2d72f93</code></a> v2.1.14</li>
<li><a href="https://github.com/basecamp/trix/commit/09ecead6dd0af626fbc0ef5f1dcb19a5f4d2cb55"><code>09ecead</code></a> Merge pull request <a href="https://redirect.github.com/basecamp/trix/issues/1232">#1232</a> from jakeonrails/jakeonrails/update-dompurify-to-3.2...</li>
<li><a href="https://github.com/basecamp/trix/commit/447c001ab353c3482c1a3af1a3b1b342c09e9898"><code>447c001</code></a> Bump dompurify to 3.2.5 to resolve security issue</li>
<li><a href="https://github.com/basecamp/trix/commit/1e214a7443b4378e76b5944e08d655b39c1a730d"><code>1e214a7</code></a> v2.1.13</li>
<li><a href="https://github.com/basecamp/trix/commit/ca6de49255c09e9a97d9576fe1f9756365fdddae"><code>ca6de49</code></a> Merge pull request <a href="https://redirect.github.com/basecamp/trix/issues/1227">#1227</a> from basecamp/morphing</li>
<li><a href="https://github.com/basecamp/trix/commit/23299417aa98c63fa3a401437e39c259d0f2aaa0"><code>2329941</code></a> Remove iOS latest since it's failing on Solano</li>
<li><a href="https://github.com/basecamp/trix/commit/a8b0f73ef7a797e052acda4d848d89802f1362f1"><code>a8b0f73</code></a> Make Trix compatible with morphing</li>
<li>Additional commits viewable in <a href="https://github.com/basecamp/trix/compare/v2.1.12...v2.1.15">compare view</a></li>
</ul>
</details>
<br />
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
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` show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency
- ``@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)
You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/EasyCorp/EasyAdminBundle/network/alerts).
</details>
Commits
-------
8d8d8f0 Bump trix from 2.1.12 to 2.1.152 files changed
+10
-10
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
19 | | - | |
| 19 | + | |
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1618 | 1618 | | |
1619 | 1619 | | |
1620 | 1620 | | |
1621 | | - | |
1622 | | - | |
1623 | | - | |
1624 | | - | |
| 1621 | + | |
| 1622 | + | |
| 1623 | + | |
| 1624 | + | |
1625 | 1625 | | |
1626 | 1626 | | |
1627 | 1627 | | |
| |||
2744 | 2744 | | |
2745 | 2745 | | |
2746 | 2746 | | |
2747 | | - | |
2748 | | - | |
2749 | | - | |
2750 | | - | |
| 2747 | + | |
| 2748 | + | |
| 2749 | + | |
| 2750 | + | |
2751 | 2751 | | |
2752 | | - | |
| 2752 | + | |
2753 | 2753 | | |
2754 | 2754 | | |
2755 | 2755 | | |
| |||
0 commit comments