-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Comparing changes
Open a pull request
base repository: basecamp/trix
base: v2.1.16
head repository: basecamp/trix
compare: v2.1.17
- 19 commits
- 13 files changed
- 4 contributors
Commits on Jun 17, 2025
-
Configuration menu - View commit details
-
Copy full SHA for 379943c - Browse repository at this point
Copy the full SHA 379943cView commit details
Commits on Dec 31, 2025
-
Replace Karma with
@web/test-runnerwhile keeping QUnit and SauceLabs. - SAUCE_REGION support to configure region - tunnelIdentifier in sauce:options - to connect through the tunnel - Local QUnit/fixtures serving - to avoid CDN issues through tunnel - hostname: '0.0.0.0' - to allow Sauce Connect to reach WTR Co-Authored-By: Claude Opus 4.5 <[email protected]>
Configuration menu - View commit details
-
Copy full SHA for bf38908 - Browse repository at this point
Copy the full SHA bf38908View commit details -
Restore Android browser testing to Sauce Labs configuration
Co-Authored-By: Claude Opus 4.5 <[email protected]>
Configuration menu - View commit details
-
Copy full SHA for 4df5db6 - Browse repository at this point
Copy the full SHA 4df5db6View commit details -
Add test progress reporting in local dev
WTR doesn't support per-test progress reporting, so let's use a middleware endpoint as a callback to emit minitest-style test status. In CI, though, we'll continue to use the default reporter because we want to see per-browser results (via Sauce Labs) and don't care about realtime progress. Co-Authored-By: Claude Opus 4.5 <[email protected]>
Configuration menu - View commit details
-
Copy full SHA for c20a85d - Browse repository at this point
Copy the full SHA c20a85dView commit details
Commits on Jan 3, 2026
-
Merge pull request #1272 from basecamp/flavorjones/replace-karma-with…
…-wtr Replace Karma with `@web/test-runner`
Configuration menu - View commit details
-
Copy full SHA for 32b1082 - Browse repository at this point
Copy the full SHA 32b1082View commit details
Commits on Jan 9, 2026
-
Configuration menu - View commit details
-
Copy full SHA for 36a2c89 - Browse repository at this point
Copy the full SHA 36a2c89View commit details -
Get downstream Rails tests passing again
The leak checker is causing issues unless we externally set RACK_ENV, see rails/rails#56563
Configuration menu - View commit details
-
Copy full SHA for ca66016 - Browse repository at this point
Copy the full SHA ca66016View commit details -
Add Ruby 4 to the testing matrix
and remove Ruby 3.2 testing against Rails main
Configuration menu - View commit details
-
Copy full SHA for e31aae7 - Browse repository at this point
Copy the full SHA e31aae7View commit details -
Update the copyright in trix.js
without which the regeneration check fails
Configuration menu - View commit details
-
Copy full SHA for 2a8dbcc - Browse repository at this point
Copy the full SHA 2a8dbccView commit details -
Merge pull request #1276 from basecamp/flavorjones/ci-green-20260109
ci: get green (2026-01-09 edition)
Configuration menu - View commit details
-
Copy full SHA for 1d2d1a3 - Browse repository at this point
Copy the full SHA 1d2d1a3View commit details -
Test runner reporter emits failure details
Neglected to include failure reporting in c20a85d 😅
Configuration menu - View commit details
-
Copy full SHA for 6f6ab9a - Browse repository at this point
Copy the full SHA 6f6ab9aView commit details -
Configuration menu - View commit details
-
Copy full SHA for c94abe6 - Browse repository at this point
Copy the full SHA c94abe6View commit details -
Merge pull request #1275 from basecamp/flavorjones/wtr-failure-messages
Report web-test-runner test failures
Configuration menu - View commit details
-
Copy full SHA for 194a36c - Browse repository at this point
Copy the full SHA 194a36cView commit details
Commits on Feb 27, 2026
-
Configuration menu - View commit details
-
Copy full SHA for bef13e2 - Browse repository at this point
Copy the full SHA bef13e2View commit details
Commits on Mar 3, 2026
-
Merge pull request #1280 from basecamp/fix-bullets-merging-with-prior…
…-element Fix bullets merging with prior elements on Firefox when the first node is removed
Configuration menu - View commit details
-
Copy full SHA for d9dbf0a - Browse repository at this point
Copy the full SHA d9dbf0aView commit details -
Configuration menu - View commit details
-
Copy full SHA for 7069343 - Browse repository at this point
Copy the full SHA 7069343View commit details
Commits on Mar 11, 2026
-
Fix stored XSS via data-trix-serialized-attributes sanitizer bypass (…
…H1 #3581911) Strip `data-trix-serialized-attributes` in the DOMPurify `uponSanitizeAttribute` hook before the `data-trix-*` force-keep logic runs. This attribute is unique among `data-trix-*` attributes: it is the only one whose value is later treated as trusted instructions to create arbitrary DOM attributes via `el.setAttribute(name, value)` in the serialization code. No other `data-trix-*` attribute has this XSS-enabling property: - `data-trix-attachment` content is re-sanitized when rendered in AttachmentView - `data-trix-attributes` is reduced to caption/presentation for attachment pieces - The remaining internal markers (data-trix-id, data-trix-store-key, etc.) are stripped or regenerated during serialization and never reach an executable sink The fix is therefore narrowly scoped to `data-trix-serialized-attributes`. The legitimate producer (PreviewableAttachmentView) sets this attribute at runtime on live DOM elements and never goes through DOMPurify, so it is unaffected.
Configuration menu - View commit details
-
Copy full SHA for 3229c29 - Browse repository at this point
Copy the full SHA 3229c29View commit details -
Merge pull request #1282 from basecamp/h1-3581911-serialized-attr
Fix stored XSS via data-trix-serialized-attributes bypass
Configuration menu - View commit details
-
Copy full SHA for 53197ab - Browse repository at this point
Copy the full SHA 53197abView commit details -
Configuration menu - View commit details
-
Copy full SHA for 2e46d51 - Browse repository at this point
Copy the full SHA 2e46d51View commit details
This comparison is taking too long to generate.
Unfortunately it looks like we can’t render this comparison for you right now. It might be too big, or there might be something weird with your repository.
You can try running this command locally to see the comparison on your machine:
git diff v2.1.16...v2.1.17