Merge pull request #1276 from basecamp/flavorjones/ci-green-20260109

ci: get green (2026-01-09 edition)

Author: flavorjones

.github/workflows/ci.yml

@@ -73,6 +73,8 @@ jobs:
           bundle add action_text-trix --path ".."
           bundle show --paths action_text-trix
       - name: Action Text tests
+        env:
+          RACK_ENV: test # see https://github.com/rails/rails/issues/56563
         run: |
           cd rails/actiontext
           bundle exec rake test test:system
@@ -103,16 +105,18 @@ jobs:
             rails_branch: 8-1-stable
           - ruby: "3.4"
             rails_branch: 8-1-stable
+          - ruby: "4.0"
+            rails_branch: 8-1-stable
 
-          - ruby: "3.2"
-            rails_branch: main
-            experimental: true
           - ruby: "3.3"
             rails_branch: main
             experimental: true
           - ruby: "3.4"
             rails_branch: main
             experimental: true
+          - ruby: "4.0"
+            rails_branch: main
+            experimental: true
 
           - ruby: head
             rails_branch: main

action_text-trix/app/assets/javascripts/trix.js

@@ -1,6 +1,6 @@
 /*
 Trix 2.1.16
-Copyright © 2025 37signals, LLC
+Copyright © 2026 37signals, LLC
  */
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :