Commit 8f22472
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>3 files changed
+3
-3
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
17 | | - | |
| 17 | + | |
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
17 | | - | |
| 17 | + | |
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
17 | | - | |
| 17 | + | |
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
| |||
0 commit comments