Skip to content

Commit 8f22472

Browse files
justin808claude
andcommitted
Merge master and resolve conflicts
Resolved conflicts in favor of our more stable versions: - Keep Ruby 3.4.6 (master had 3.4.3) - Keep Shakapacker 9.3.3 stable (master had 9.3.4-beta.0) - Keep Thruster HTTP/2 proxy integration (not in master) - Keep Dockerfile improvements (FROM AS, SECRET_KEY_BASE handling) - Keep early_hints debug: false (master doesn't have this config) Accepted from master: - GitHub Actions workflow updates for Ruby version - react_on_rails 16.2.0.beta.10 (already had this) 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
2 parents 57f21f1 + fd95be6 commit 8f22472

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

.github/workflows/js_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
fail-fast: false
1515
matrix:
1616
node: [22.x]
17-
ruby: [3.4.6]
17+
ruby: [3.4.3]
1818

1919
env:
2020
RAILS_ENV: test

.github/workflows/lint_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
fail-fast: false
1515
matrix:
1616
node: [22.x]
17-
ruby: [3.4.6]
17+
ruby: [3.4.3]
1818

1919
env:
2020
RAILS_ENV: test

.github/workflows/rspec_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
fail-fast: false
1515
matrix:
1616
node: [22.x]
17-
ruby: [3.4.6]
17+
ruby: [3.4.3]
1818

1919
services:
2020
postgres:

0 commit comments

Comments
 (0)