From b91567b0b16b503ad3d94e4245aba5af47e2bd74 Mon Sep 17 00:00:00 2001 From: Ernesto Tagwerker Date: Fri, 20 Nov 2026 23:09:13 -0500 Subject: [PATCH 01/10] Update Rails to 7.0.10 and ffi to 1.17 ffi 1.15.5 does not compile on current macOS SDKs. Rails 7.0.10 is the latest patch of the 7.0 series, the starting point for the 8.1 upgrade. Co-Authored-By: Claude Sonnet 5.5 --- Gemfile.lock | 128 +++++++++++++++++++++++++++++---------------------- 1 file changed, 73 insertions(+), 55 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 64a25ae..411dc84 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -10,75 +10,86 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (7.0.4) - actionpack (= 7.0.4) - activesupport (= 7.0.4) + actioncable (7.0.10) + actionpack (= 7.0.10) + activesupport (= 7.0.10) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (7.0.4) - actionpack (= 7.0.4) - activejob (= 7.0.4) - activerecord (= 7.0.4) - activestorage (= 7.0.4) - activesupport (= 7.0.4) + actionmailbox (7.0.10) + actionpack (= 7.0.10) + activejob (= 7.0.10) + activerecord (= 7.0.10) + activestorage (= 7.0.10) + activesupport (= 7.0.10) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.0.4) - actionpack (= 7.0.4) - actionview (= 7.0.4) - activejob (= 7.0.4) - activesupport (= 7.0.4) + actionmailer (7.0.10) + actionpack (= 7.0.10) + actionview (= 7.0.10) + activejob (= 7.0.10) + activesupport (= 7.0.10) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.0) - actionpack (7.0.4) - actionview (= 7.0.4) - activesupport (= 7.0.4) - rack (~> 2.0, >= 2.2.0) + actionpack (7.0.10) + actionview (= 7.0.10) + activesupport (= 7.0.10) + racc + rack (~> 2.0, >= 2.2.4) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (7.0.4) - actionpack (= 7.0.4) - activerecord (= 7.0.4) - activestorage (= 7.0.4) - activesupport (= 7.0.4) + actiontext (7.0.10) + actionpack (= 7.0.10) + activerecord (= 7.0.10) + activestorage (= 7.0.10) + activesupport (= 7.0.10) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.0.4) - activesupport (= 7.0.4) + actionview (7.0.10) + activesupport (= 7.0.10) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (7.0.4) - activesupport (= 7.0.4) + activejob (7.0.10) + activesupport (= 7.0.10) globalid (>= 0.3.6) - activemodel (7.0.4) - activesupport (= 7.0.4) - activerecord (7.0.4) - activemodel (= 7.0.4) - activesupport (= 7.0.4) - activestorage (7.0.4) - actionpack (= 7.0.4) - activejob (= 7.0.4) - activerecord (= 7.0.4) - activesupport (= 7.0.4) + activemodel (7.0.10) + activesupport (= 7.0.10) + activerecord (7.0.10) + activemodel (= 7.0.10) + activesupport (= 7.0.10) + activestorage (7.0.10) + actionpack (= 7.0.10) + activejob (= 7.0.10) + activerecord (= 7.0.10) + activesupport (= 7.0.10) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (7.0.4) + activesupport (7.0.10) + base64 + benchmark (>= 0.3) + bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) + drb i18n (>= 1.6, < 2) + logger (>= 1.4.2) minitest (>= 5.1) + mutex_m + securerandom (>= 0.3) tzinfo (~> 2.0) addressable (2.8.1) public_suffix (>= 2.0.2, < 6.0) ast (2.4.2) + base64 (0.3.0) bcrypt (3.1.18) + benchmark (0.5.0) + bigdecimal (4.1.3) bindex (0.8.1) bootsnap (1.13.0) msgpack (~> 1.2) @@ -119,6 +130,7 @@ GEM railties (>= 3.2) dotenv_validator (1.2.0) fast_blank (~> 1.0.0) + drb (2.2.3) erubi (1.11.0) ethon (0.15.0) ffi (>= 1.15.0) @@ -132,7 +144,10 @@ GEM ruby2_keywords (>= 0.0.4) faraday-net_http (3.0.2) fast_blank (1.0.1) - ffi (1.15.5) + ffi (1.17.4-aarch64-linux-gnu) + ffi (1.17.4-arm64-darwin) + ffi (1.17.4-x86_64-darwin) + ffi (1.17.4-x86_64-linux-gnu) formatador (1.1.0) globalid (1.0.0) activesupport (>= 5.0) @@ -170,6 +185,7 @@ GEM listen (3.7.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) + logger (1.7.0) loofah (2.19.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) @@ -197,6 +213,7 @@ GEM minitest (5.16.3) msgpack (1.6.0) multi_xml (0.6.0) + mutex_m (0.3.0) nenv (0.3.0) net-http-digest_auth (1.4.1) net-http-persistent (4.0.1) @@ -278,20 +295,20 @@ GEM rack rack-test (2.0.2) rack (>= 1.3) - rails (7.0.4) - actioncable (= 7.0.4) - actionmailbox (= 7.0.4) - actionmailer (= 7.0.4) - actionpack (= 7.0.4) - actiontext (= 7.0.4) - actionview (= 7.0.4) - activejob (= 7.0.4) - activemodel (= 7.0.4) - activerecord (= 7.0.4) - activestorage (= 7.0.4) - activesupport (= 7.0.4) + rails (7.0.10) + actioncable (= 7.0.10) + actionmailbox (= 7.0.10) + actionmailer (= 7.0.10) + actionpack (= 7.0.10) + actiontext (= 7.0.10) + actionview (= 7.0.10) + activejob (= 7.0.10) + activemodel (= 7.0.10) + activerecord (= 7.0.10) + activestorage (= 7.0.10) + activesupport (= 7.0.10) bundler (>= 1.15.0) - railties (= 7.0.4) + railties (= 7.0.10) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -301,9 +318,9 @@ GEM nokogiri (>= 1.6) rails-html-sanitizer (1.4.3) loofah (~> 2.3) - railties (7.0.4) - actionpack (= 7.0.4) - activesupport (= 7.0.4) + railties (7.0.10) + actionpack (= 7.0.10) + activesupport (= 7.0.10) method_source rake (>= 12.2) thor (~> 1.0) @@ -372,6 +389,7 @@ GEM ruby2_keywords (0.0.5) rubyntlm (0.6.3) rubyzip (2.3.2) + securerandom (0.4.1) selenium-webdriver (4.5.0) childprocess (>= 0.5, < 5.0) rexml (~> 3.2, >= 3.2.5) From 69845b797d9c2e91d8b85fc7be5053d8562b6ba5 Mon Sep 17 00:00:00 2001 From: Ernesto Tagwerker Date: Fri, 20 Nov 2026 23:38:13 -0500 Subject: [PATCH 02/10] Update rspec-rails to 7.1 and ombu_labs-auth to 1.2 Backward-compatible gem bumps on Rails 7.0 so the next hops don't need version branching for them. ombu_labs-auth 1.2 allows Devise 5, which drops the Rails.application.secrets usage that Rails 7.2 removes. Co-Authored-By: Claude Sonnet 5.5 --- Gemfile.lock | 206 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 122 insertions(+), 84 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 411dc84..9204294 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -85,15 +85,19 @@ GEM tzinfo (~> 2.0) addressable (2.8.1) public_suffix (>= 2.0.2, < 6.0) + anonymous_loader (0.1.5) + version_gem (~> 1.1, >= 1.1.17) ast (2.4.2) + auth-sanitizer (0.2.5) + version_gem (~> 1.1, >= 1.1.16) base64 (0.3.0) - bcrypt (3.1.18) + bcrypt (3.1.22) benchmark (0.5.0) bigdecimal (4.1.3) bindex (0.8.1) bootsnap (1.13.0) msgpack (~> 1.2) - builder (3.2.4) + builder (3.3.0) capybara (3.37.1) addressable matrix @@ -106,21 +110,22 @@ GEM childprocess (4.1.0) coderay (1.1.3) colorize (0.8.1) - concurrent-ruby (1.1.10) + concurrent-ruby (1.3.8) connection_pool (2.3.0) - crass (1.0.6) + crass (1.0.8) cssbundling-rails (1.1.1) railties (>= 6.0.0) + date (3.6.0) debug (1.6.2) irb (>= 1.3.6) reline (>= 0.3.1) - devise (4.8.1) + devise (5.0.4) bcrypt (~> 3.0) orm_adapter (~> 0.1) - railties (>= 4.1.0) + railties (>= 7.0) responders warden (~> 1.2.3) - diff-lcs (1.5.0) + diff-lcs (1.6.2) docile (1.4.0) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) @@ -131,7 +136,7 @@ GEM dotenv_validator (1.2.0) fast_blank (~> 1.0.0) drb (2.2.3) - erubi (1.11.0) + erubi (1.13.1) ethon (0.15.0) ffi (>= 1.15.0) factory_bot (6.2.1) @@ -139,18 +144,20 @@ GEM factory_bot_rails (6.2.0) factory_bot (~> 6.2.0) railties (>= 5.0.0) - faraday (2.7.6) - faraday-net_http (>= 2.0, < 3.1) - ruby2_keywords (>= 0.0.4) - faraday-net_http (3.0.2) + faraday (2.15.1) + faraday-net_http (>= 2.0, < 3.6) + json + logger + faraday-net_http (3.5.0) + net-http (~> 0.5) fast_blank (1.0.1) ffi (1.17.4-aarch64-linux-gnu) ffi (1.17.4-arm64-darwin) ffi (1.17.4-x86_64-darwin) ffi (1.17.4-x86_64-linux-gnu) formatador (1.1.0) - globalid (1.0.0) - activesupport (>= 5.0) + globalid (1.4.0) + activesupport (>= 6.1) guard (2.18.0) formatador (>= 0.2.4) listen (>= 2.7, < 4.0) @@ -165,13 +172,14 @@ GEM guard (~> 2.1) guard-compat (~> 1.1) rspec (>= 2.99.0, < 4.0) - hashie (5.0.0) + hashie (5.2.0) + logger http-cookie (1.0.5) domain_name (~> 0.5) httparty (0.20.0) mime-types (~> 3.0) multi_xml (>= 0.5.2) - i18n (1.12.0) + i18n (1.15.2) concurrent-ruby (~> 1.0) iniparse (1.5.0) io-console (0.5.11) @@ -180,19 +188,24 @@ GEM jsbundling-rails (1.0.3) railties (>= 6.0.0) json (2.6.2) - jwt (2.7.1) + jwt (3.3.0) + base64 kwalify (0.7.2) listen (3.7.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) logger (1.7.0) - loofah (2.19.0) + loofah (2.25.3) crass (~> 1.0.2) - nokogiri (>= 1.5.9) + nokogiri (>= 1.19.5) lumberjack (1.2.8) - mail (2.7.1) + mail (2.9.1) + logger mini_mime (>= 0.1.1) - marcel (1.0.2) + net-imap + net-pop + net-smtp + marcel (1.2.1) matrix (0.4.2) mechanize (2.8.5) addressable (~> 2.8) @@ -205,30 +218,37 @@ GEM rubyntlm (~> 0.6, >= 0.6.3) webrick (~> 1.7) webrobots (~> 0.1.2) - method_source (1.0.0) + method_source (1.1.0) mime-types (3.4.1) mime-types-data (~> 3.2015) mime-types-data (3.2022.0105) - mini_mime (1.1.2) - minitest (5.16.3) + mini_mime (1.1.5) + minitest (6.1.0) + drb (~> 2.0) + prism (>= 1.5, < 3) msgpack (1.6.0) - multi_xml (0.6.0) + multi_xml (0.9.1) + bigdecimal (>= 3.1, < 5) mutex_m (0.3.0) nenv (0.3.0) + net-http (0.10.0) + net-protocol (>= 0.3.0) + uri (>= 0.11.1) net-http-digest_auth (1.4.1) net-http-persistent (4.0.1) connection_pool (~> 2.2) - net-imap (0.3.1) + net-imap (0.6.8) + date net-protocol net-pop (0.1.2) net-protocol - net-protocol (0.1.3) + net-protocol (0.4.0) timeout - net-smtp (0.3.3) + net-smtp (0.5.2) net-protocol next_rails (1.2.1) colorize (>= 0.8.1) - nio4r (2.5.9) + nio4r (2.7.5) nokogiri (1.19.7-aarch64-linux-gnu) racc (~> 1.4) nokogiri (1.19.7-arm64-darwin) @@ -240,32 +260,42 @@ GEM notiffany (0.1.3) nenv (~> 0.1) shellany (~> 0.0) - oauth2 (2.0.9) - faraday (>= 0.17.3, < 3.0) - jwt (>= 1.0, < 3.0) + oauth2 (2.1.0) + anonymous_loader (~> 0.1, >= 0.1.5) + auth-sanitizer (~> 0.2, >= 0.2.5) + faraday (>= 0.17.3, < 4.0) + jwt (>= 1.0, < 4.0) + logger (~> 1.2) multi_xml (~> 0.5) rack (>= 1.2, < 4) - snaky_hash (~> 2.0) - version_gem (~> 1.1) - ombu_labs-auth (1.0.0) - devise (~> 4.8.1) + snaky_hash (~> 2.0, >= 2.0.9) + version_gem (~> 1.1, >= 1.1.17) + ombu_labs-auth (1.2.0) + devise (>= 4.9) omniauth (~> 2.1.0) omniauth-github (~> 2.0.0) + omniauth-google-oauth2 (~> 1.1) omniauth-rails_csrf_protection rails (>= 6.0) ombu_labs-shortener (0.2.0) rebrandly - omniauth (2.1.1) + omniauth (2.1.4) hashie (>= 3.4.6) + logger rack (>= 2.2.3) rack-protection omniauth-github (2.0.1) omniauth (~> 2.0) omniauth-oauth2 (~> 1.8) - omniauth-oauth2 (1.8.0) - oauth2 (>= 1.4, < 3) + omniauth-google-oauth2 (1.2.3) + jwt (>= 2.9.2, < 4) + oauth2 (~> 2.0) + omniauth (~> 2.0) + omniauth-oauth2 (~> 1.8) + omniauth-oauth2 (1.9.0) + oauth2 (>= 2.0.2, < 3) omniauth (~> 2.0) - omniauth-rails_csrf_protection (1.0.1) + omniauth-rails_csrf_protection (2.0.1) actionpack (>= 4.2) omniauth (~> 2.0) orm_adapter (0.5.0) @@ -278,6 +308,10 @@ GEM parser (3.1.2.1) ast (~> 2.4.1) pg (1.4.3) + prism (2.1.0-aarch64-linux-gnu) + prism (2.1.0-arm64-darwin) + prism (2.1.0-x86_64-darwin) + prism (2.1.0-x86_64-linux-gnu) propshaft (0.6.4) actionpack (>= 7.0.0) activesupport (>= 7.0.0) @@ -290,10 +324,11 @@ GEM puma (8.1.2) nio4r (~> 2.0) racc (1.8.1) - rack (2.2.25) - rack-protection (3.0.6) - rack - rack-test (2.0.2) + rack (2.2.26) + rack-protection (3.2.0) + base64 (>= 0.1.0) + rack (~> 2.2, >= 2.2.4) + rack-test (2.3.0) rack (>= 1.3) rails (7.0.10) actioncable (= 7.0.10) @@ -313,11 +348,13 @@ GEM actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) activesupport (>= 5.0.1.rc1) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) + rails-dom-testing (2.3.0) + activesupport (>= 5.0.0) + minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.4.3) - loofah (~> 2.3) + rails-html-sanitizer (1.7.2) + loofah (~> 2.25, >= 2.25.3) + nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0) railties (7.0.10) actionpack (= 7.0.10) activesupport (= 7.0.10) @@ -326,7 +363,7 @@ GEM thor (~> 1.0) zeitwerk (~> 2.5) rainbow (3.1.1) - rake (13.0.6) + rake (13.4.2) rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) @@ -339,31 +376,31 @@ GEM regexp_parser (2.6.0) reline (0.3.1) io-console (~> 0.5) - responders (3.1.0) - actionpack (>= 5.2) - railties (>= 5.2) + responders (3.2.1) + actionpack (>= 7.0) + railties (>= 7.0) rexml (3.2.5) - rspec (3.11.0) - rspec-core (~> 3.11.0) - rspec-expectations (~> 3.11.0) - rspec-mocks (~> 3.11.0) - rspec-core (3.11.0) - rspec-support (~> 3.11.0) - rspec-expectations (3.11.1) + rspec (3.13.2) + rspec-core (~> 3.13.0) + rspec-expectations (~> 3.13.0) + rspec-mocks (~> 3.13.0) + rspec-core (3.13.7) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.6) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) - rspec-mocks (3.11.1) + rspec-support (~> 3.13.0) + rspec-mocks (3.13.9) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) - rspec-rails (5.1.2) - actionpack (>= 5.2) - activesupport (>= 5.2) - railties (>= 5.2) - rspec-core (~> 3.10) - rspec-expectations (~> 3.10) - rspec-mocks (~> 3.10) - rspec-support (~> 3.10) - rspec-support (3.11.1) + rspec-support (~> 3.13.0) + rspec-rails (7.1.1) + actionpack (>= 7.0) + activesupport (>= 7.0) + railties (>= 7.0) + rspec-core (~> 3.13) + rspec-expectations (~> 3.13) + rspec-mocks (~> 3.13) + rspec-support (~> 3.13) + rspec-support (3.13.8) rubocop (1.35.1) json (~> 2.3) parallel (~> 1.10) @@ -386,7 +423,6 @@ GEM rubocop-rspec (2.13.2) rubocop (~> 1.33) ruby-progressbar (1.11.0) - ruby2_keywords (0.0.5) rubyntlm (0.6.3) rubyzip (2.3.2) securerandom (0.4.1) @@ -402,9 +438,9 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - snaky_hash (2.0.1) - hashie - version_gem (~> 1.1, >= 1.1.1) + snaky_hash (2.0.9) + hashie (>= 0.1.0, < 6) + version_gem (~> 1.1, >= 1.1.16) standard (1.16.1) rubocop (= 1.35.1) rubocop-performance (= 1.14.3) @@ -418,17 +454,18 @@ GEM railties (>= 6.0.0) tailwindcss-rails (2.0.16-x86_64-linux) railties (>= 6.0.0) - thor (1.2.1) - timeout (0.3.0) + thor (1.5.0) + timeout (0.6.1) typhoeus (1.4.0) ethon (>= 0.9.0) - tzinfo (2.0.5) + tzinfo (2.0.6) concurrent-ruby (~> 1.0) unf (0.1.4) unf_ext unf_ext (0.0.8.2) unicode-display_width (2.3.0) - version_gem (1.1.3) + uri (1.1.2) + version_gem (1.1.17) warden (1.2.9) rack (>= 2.0.9) web-console (4.2.0) @@ -443,12 +480,13 @@ GEM webrick (1.7.0) webrobots (0.1.2) websocket (1.2.9) - websocket-driver (0.7.5) - websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.5) + websocket-driver (0.9.0) + base64 + websocket-extensions (>= 0.2.0) + websocket-extensions (0.2.0) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.6.4) + zeitwerk (2.8.3) PLATFORMS aarch64-linux @@ -499,4 +537,4 @@ RUBY VERSION ruby 3.3.14p208 BUNDLED WITH - 2.3.23 + 2.5.22 From 4d7f41d51e5631b55cc901f34f66888e4e4f798f Mon Sep 17 00:00:00 2001 From: Ernesto Tagwerker Date: Fri, 20 Nov 2026 23:40:17 -0500 Subject: [PATCH 03/10] Set up dual-boot for Rails 7.0 and 7.1 - next_rails moved to the root of the Gemfile, bumped to 1.7 (NextRails.next?) - Gemfile.next (symlink) and Gemfile.next.lock - CI runs the suite against both Gemfile and Gemfile.next - Two-sided 7.1 changes branch on NextRails.next?: cache_classes -> enable_reloading, show_exceptions = :none Co-Authored-By: Claude Sonnet 5.5 --- .github/workflows/main.yml | 11 +- Gemfile | 13 +- Gemfile.lock | 6 +- Gemfile.next | 1 + Gemfile.next.lock | 554 +++++++++++++++++++++++++++++ config/environments/development.rb | 6 +- config/environments/production.rb | 6 +- config/environments/test.rb | 12 +- 8 files changed, 597 insertions(+), 12 deletions(-) create mode 120000 Gemfile.next create mode 100644 Gemfile.next.lock diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index be439e9..d6c89a5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,8 +10,15 @@ on: - main jobs: - test-rails-current: + test: + name: Test (${{ matrix.gemfile }}) runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + gemfile: [Gemfile, Gemfile.next] + env: + BUNDLE_GEMFILE: ${{ github.workspace }}/${{ matrix.gemfile }} services: postgres: image: postgres:11.6-alpine @@ -42,7 +49,7 @@ jobs: env: RAILS_ENV: test run: | - gem install bundler:2.3.23 + gem install bundler:2.5.22 bundle install --jobs 4 --retry 3 yarn install bundle exec rake db:setup diff --git a/Gemfile b/Gemfile index 643002c..0771c26 100644 --- a/Gemfile +++ b/Gemfile @@ -3,8 +3,18 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" } ruby "3.3.14" +def next? + File.basename(__FILE__) == "Gemfile.next" +end + +gem "next_rails" + # Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main" -gem "rails", "~> 7.0.4" +if next? + gem "rails", "~> 7.1.0" +else + gem "rails", "~> 7.0.10" +end # Application Dependencies gem "dotenv-rails" @@ -82,7 +92,6 @@ group :development, :test do gem "rubocop-rails" gem "reek" gem "overcommit", "0.57.0" - gem "next_rails" end gem "dotenv_validator" gem "pagy" diff --git a/Gemfile.lock b/Gemfile.lock index 9204294..45becc6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -109,7 +109,6 @@ GEM xpath (~> 3.2) childprocess (4.1.0) coderay (1.1.3) - colorize (0.8.1) concurrent-ruby (1.3.8) connection_pool (2.3.0) crass (1.0.8) @@ -246,8 +245,7 @@ GEM timeout net-smtp (0.5.2) net-protocol - next_rails (1.2.1) - colorize (>= 0.8.1) + next_rails (1.7.0) nio4r (2.7.5) nokogiri (1.19.7-aarch64-linux-gnu) racc (~> 1.4) @@ -517,7 +515,7 @@ DEPENDENCIES pg (~> 1.1) propshaft puma (~> 8.1) - rails (~> 7.0.4) + rails (~> 7.0.10) rails-controller-testing reek rspec-rails diff --git a/Gemfile.next b/Gemfile.next new file mode 120000 index 0000000..6ab7900 --- /dev/null +++ b/Gemfile.next @@ -0,0 +1 @@ +Gemfile \ No newline at end of file diff --git a/Gemfile.next.lock b/Gemfile.next.lock new file mode 100644 index 0000000..e9b7c95 --- /dev/null +++ b/Gemfile.next.lock @@ -0,0 +1,554 @@ +GIT + remote: https://github.com/fastruby/sitemap-parser.git + revision: 5c7a74c0e4d69f63d277f6e1c8163ffa3566ca07 + branch: fixes/recurse-to-level-n + specs: + sitemap-parser (0.5.6) + nokogiri (~> 1.6) + typhoeus (>= 0.6, < 2.0) + +GEM + remote: https://rubygems.org/ + specs: + actioncable (7.1.6) + actionpack (= 7.1.6) + activesupport (= 7.1.6) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + zeitwerk (~> 2.6) + actionmailbox (7.1.6) + actionpack (= 7.1.6) + activejob (= 7.1.6) + activerecord (= 7.1.6) + activestorage (= 7.1.6) + activesupport (= 7.1.6) + mail (>= 2.7.1) + net-imap + net-pop + net-smtp + actionmailer (7.1.6) + actionpack (= 7.1.6) + actionview (= 7.1.6) + activejob (= 7.1.6) + activesupport (= 7.1.6) + mail (~> 2.5, >= 2.5.4) + net-imap + net-pop + net-smtp + rails-dom-testing (~> 2.2) + actionpack (7.1.6) + actionview (= 7.1.6) + activesupport (= 7.1.6) + cgi + nokogiri (>= 1.8.5) + racc + rack (>= 2.2.4) + rack-session (>= 1.0.1) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + actiontext (7.1.6) + actionpack (= 7.1.6) + activerecord (= 7.1.6) + activestorage (= 7.1.6) + activesupport (= 7.1.6) + globalid (>= 0.6.0) + nokogiri (>= 1.8.5) + actionview (7.1.6) + activesupport (= 7.1.6) + builder (~> 3.1) + cgi + erubi (~> 1.11) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + activejob (7.1.6) + activesupport (= 7.1.6) + globalid (>= 0.3.6) + activemodel (7.1.6) + activesupport (= 7.1.6) + activerecord (7.1.6) + activemodel (= 7.1.6) + activesupport (= 7.1.6) + timeout (>= 0.4.0) + activestorage (7.1.6) + actionpack (= 7.1.6) + activejob (= 7.1.6) + activerecord (= 7.1.6) + activesupport (= 7.1.6) + marcel (~> 1.0) + activesupport (7.1.6) + base64 + benchmark (>= 0.3) + bigdecimal + concurrent-ruby (~> 1.0, >= 1.0.2) + connection_pool (>= 2.2.5) + drb + i18n (>= 1.6, < 2) + logger (>= 1.4.2) + minitest (>= 5.1) + mutex_m + securerandom (>= 0.3) + tzinfo (~> 2.0) + addressable (2.8.1) + public_suffix (>= 2.0.2, < 6.0) + anonymous_loader (0.1.5) + version_gem (~> 1.1, >= 1.1.17) + ast (2.4.2) + auth-sanitizer (0.2.5) + version_gem (~> 1.1, >= 1.1.16) + base64 (0.3.0) + bcrypt (3.1.22) + benchmark (0.5.0) + bigdecimal (4.1.3) + bindex (0.8.1) + bootsnap (1.13.0) + msgpack (~> 1.2) + builder (3.3.0) + capybara (3.37.1) + addressable + matrix + mini_mime (>= 0.1.3) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + regexp_parser (>= 1.5, < 3.0) + xpath (~> 3.2) + cgi (0.5.2) + childprocess (4.1.0) + coderay (1.1.3) + concurrent-ruby (1.3.8) + connection_pool (2.3.0) + crass (1.0.8) + cssbundling-rails (1.1.1) + railties (>= 6.0.0) + date (3.6.0) + debug (1.6.2) + irb (>= 1.3.6) + reline (>= 0.3.1) + devise (5.0.4) + bcrypt (~> 3.0) + orm_adapter (~> 0.1) + railties (>= 7.0) + responders + warden (~> 1.2.3) + diff-lcs (1.6.2) + docile (1.4.0) + domain_name (0.5.20190701) + unf (>= 0.0.5, < 1.0.0) + dotenv (2.8.1) + dotenv-rails (2.8.1) + dotenv (= 2.8.1) + railties (>= 3.2) + dotenv_validator (1.2.0) + fast_blank (~> 1.0.0) + drb (2.2.3) + erubi (1.13.1) + ethon (0.15.0) + ffi (>= 1.15.0) + factory_bot (6.2.1) + activesupport (>= 5.0.0) + factory_bot_rails (6.2.0) + factory_bot (~> 6.2.0) + railties (>= 5.0.0) + faraday (2.15.1) + faraday-net_http (>= 2.0, < 3.6) + json + logger + faraday-net_http (3.5.0) + net-http (~> 0.5) + fast_blank (1.0.1) + ffi (1.17.4-aarch64-linux-gnu) + ffi (1.17.4-arm64-darwin) + ffi (1.17.4-x86_64-darwin) + ffi (1.17.4-x86_64-linux-gnu) + formatador (1.1.0) + globalid (1.4.0) + activesupport (>= 6.1) + guard (2.18.0) + formatador (>= 0.2.4) + listen (>= 2.7, < 4.0) + lumberjack (>= 1.0.12, < 2.0) + nenv (~> 0.1) + notiffany (~> 0.0) + pry (>= 0.13.0) + shellany (~> 0.0) + thor (>= 0.18.1) + guard-compat (1.2.1) + guard-rspec (4.7.3) + guard (~> 2.1) + guard-compat (~> 1.1) + rspec (>= 2.99.0, < 4.0) + hashie (5.2.0) + logger + http-cookie (1.0.5) + domain_name (~> 0.5) + httparty (0.20.0) + mime-types (~> 3.0) + multi_xml (>= 0.5.2) + i18n (1.15.2) + concurrent-ruby (~> 1.0) + iniparse (1.5.0) + io-console (0.5.11) + irb (1.4.2) + reline (>= 0.3.0) + jsbundling-rails (1.0.3) + railties (>= 6.0.0) + json (2.6.2) + jwt (3.3.0) + base64 + kwalify (0.7.2) + listen (3.7.1) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + logger (1.7.0) + loofah (2.25.3) + crass (~> 1.0.2) + nokogiri (>= 1.19.5) + lumberjack (1.2.8) + mail (2.9.1) + logger + mini_mime (>= 0.1.1) + net-imap + net-pop + net-smtp + marcel (1.2.1) + matrix (0.4.2) + mechanize (2.8.5) + addressable (~> 2.8) + domain_name (~> 0.5, >= 0.5.20190701) + http-cookie (~> 1.0, >= 1.0.3) + mime-types (~> 3.0) + net-http-digest_auth (~> 1.4, >= 1.4.1) + net-http-persistent (>= 2.5.2, < 5.0.dev) + nokogiri (~> 1.11, >= 1.11.2) + rubyntlm (~> 0.6, >= 0.6.3) + webrick (~> 1.7) + webrobots (~> 0.1.2) + method_source (1.1.0) + mime-types (3.4.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2022.0105) + mini_mime (1.1.5) + minitest (6.1.0) + drb (~> 2.0) + prism (>= 1.5, < 3) + msgpack (1.6.0) + multi_xml (0.9.1) + bigdecimal (>= 3.1, < 5) + mutex_m (0.3.0) + nenv (0.3.0) + net-http (0.10.0) + net-protocol (>= 0.3.0) + uri (>= 0.11.1) + net-http-digest_auth (1.4.1) + net-http-persistent (4.0.1) + connection_pool (~> 2.2) + net-imap (0.6.8) + date + net-protocol + net-pop (0.1.2) + net-protocol + net-protocol (0.4.0) + timeout + net-smtp (0.5.2) + net-protocol + next_rails (1.7.0) + nio4r (2.7.5) + nokogiri (1.19.7-aarch64-linux-gnu) + racc (~> 1.4) + nokogiri (1.19.7-arm64-darwin) + racc (~> 1.4) + nokogiri (1.19.7-x86_64-darwin) + racc (~> 1.4) + nokogiri (1.19.7-x86_64-linux-gnu) + racc (~> 1.4) + notiffany (0.1.3) + nenv (~> 0.1) + shellany (~> 0.0) + oauth2 (2.1.0) + anonymous_loader (~> 0.1, >= 0.1.5) + auth-sanitizer (~> 0.2, >= 0.2.5) + faraday (>= 0.17.3, < 4.0) + jwt (>= 1.0, < 4.0) + logger (~> 1.2) + multi_xml (~> 0.5) + rack (>= 1.2, < 4) + snaky_hash (~> 2.0, >= 2.0.9) + version_gem (~> 1.1, >= 1.1.17) + ombu_labs-auth (1.2.0) + devise (>= 4.9) + omniauth (~> 2.1.0) + omniauth-github (~> 2.0.0) + omniauth-google-oauth2 (~> 1.1) + omniauth-rails_csrf_protection + rails (>= 6.0) + ombu_labs-shortener (0.2.0) + rebrandly + omniauth (2.1.4) + hashie (>= 3.4.6) + logger + rack (>= 2.2.3) + rack-protection + omniauth-github (2.0.1) + omniauth (~> 2.0) + omniauth-oauth2 (~> 1.8) + omniauth-google-oauth2 (1.2.3) + jwt (>= 2.9.2, < 4) + oauth2 (~> 2.0) + omniauth (~> 2.0) + omniauth-oauth2 (~> 1.8) + omniauth-oauth2 (1.9.0) + oauth2 (>= 2.0.2, < 3) + omniauth (~> 2.0) + omniauth-rails_csrf_protection (2.0.1) + actionpack (>= 4.2) + omniauth (~> 2.0) + orm_adapter (0.5.0) + overcommit (0.57.0) + childprocess (>= 0.6.3, < 5) + iniparse (~> 1.4) + pagy (5.10.1) + activesupport + parallel (1.22.1) + parser (3.1.2.1) + ast (~> 2.4.1) + pg (1.4.3) + prism (2.1.0-aarch64-linux-gnu) + prism (2.1.0-arm64-darwin) + prism (2.1.0-x86_64-darwin) + prism (2.1.0-x86_64-linux-gnu) + propshaft (0.6.4) + actionpack (>= 7.0.0) + activesupport (>= 7.0.0) + rack + railties (>= 7.0.0) + pry (0.14.1) + coderay (~> 1.1) + method_source (~> 1.0) + public_suffix (5.0.0) + puma (8.1.2) + nio4r (~> 2.0) + racc (1.8.1) + rack (2.2.26) + rack-protection (3.2.0) + base64 (>= 0.1.0) + rack (~> 2.2, >= 2.2.4) + rack-session (1.0.2) + rack (< 3) + rack-test (2.3.0) + rack (>= 1.3) + rackup (1.0.1) + rack (< 3) + webrick + rails (7.1.6) + actioncable (= 7.1.6) + actionmailbox (= 7.1.6) + actionmailer (= 7.1.6) + actionpack (= 7.1.6) + actiontext (= 7.1.6) + actionview (= 7.1.6) + activejob (= 7.1.6) + activemodel (= 7.1.6) + activerecord (= 7.1.6) + activestorage (= 7.1.6) + activesupport (= 7.1.6) + bundler (>= 1.15.0) + railties (= 7.1.6) + rails-controller-testing (1.0.5) + actionpack (>= 5.0.1.rc1) + actionview (>= 5.0.1.rc1) + activesupport (>= 5.0.1.rc1) + rails-dom-testing (2.3.0) + activesupport (>= 5.0.0) + minitest + nokogiri (>= 1.6) + rails-html-sanitizer (1.7.2) + loofah (~> 2.25, >= 2.25.3) + nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0) + railties (7.1.6) + actionpack (= 7.1.6) + activesupport (= 7.1.6) + cgi + irb + rackup (>= 1.0.0) + rake (>= 12.2) + thor (~> 1.0, >= 1.2.2) + tsort (>= 0.2) + zeitwerk (~> 2.6) + rainbow (3.1.1) + rake (13.4.2) + rb-fsevent (0.11.2) + rb-inotify (0.10.1) + ffi (~> 1.0) + rebrandly (0.1.5) + httparty (~> 0.14) + reek (6.1.1) + kwalify (~> 0.7.0) + parser (~> 3.1.0) + rainbow (>= 2.0, < 4.0) + regexp_parser (2.6.0) + reline (0.3.1) + io-console (~> 0.5) + responders (3.2.1) + actionpack (>= 7.0) + railties (>= 7.0) + rexml (3.2.5) + rspec (3.13.2) + rspec-core (~> 3.13.0) + rspec-expectations (~> 3.13.0) + rspec-mocks (~> 3.13.0) + rspec-core (3.13.7) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.6) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.13.0) + rspec-mocks (3.13.9) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.13.0) + rspec-rails (7.1.1) + actionpack (>= 7.0) + activesupport (>= 7.0) + railties (>= 7.0) + rspec-core (~> 3.13) + rspec-expectations (~> 3.13) + rspec-mocks (~> 3.13) + rspec-support (~> 3.13) + rspec-support (3.13.8) + rubocop (1.35.1) + json (~> 2.3) + parallel (~> 1.10) + parser (>= 3.1.2.1) + rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.8, < 3.0) + rexml (>= 3.2.5, < 4.0) + rubocop-ast (>= 1.20.1, < 2.0) + ruby-progressbar (~> 1.7) + unicode-display_width (>= 1.4.0, < 3.0) + rubocop-ast (1.21.0) + parser (>= 3.1.1.0) + rubocop-performance (1.14.3) + rubocop (>= 1.7.0, < 2.0) + rubocop-ast (>= 0.4.0) + rubocop-rails (2.16.1) + activesupport (>= 4.2.0) + rack (>= 1.1) + rubocop (>= 1.33.0, < 2.0) + rubocop-rspec (2.13.2) + rubocop (~> 1.33) + ruby-progressbar (1.11.0) + rubyntlm (0.6.3) + rubyzip (2.3.2) + securerandom (0.4.1) + selenium-webdriver (4.5.0) + childprocess (>= 0.5, < 5.0) + rexml (~> 3.2, >= 3.2.5) + rubyzip (>= 1.2.2, < 3.0) + websocket (~> 1.0) + shellany (0.0.1) + simplecov (0.21.2) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-html (0.12.3) + simplecov_json_formatter (0.1.4) + snaky_hash (2.0.9) + hashie (>= 0.1.0, < 6) + version_gem (~> 1.1, >= 1.1.16) + standard (1.16.1) + rubocop (= 1.35.1) + rubocop-performance (= 1.14.3) + stimulus-rails (1.1.0) + railties (>= 6.0.0) + tailwindcss-rails (2.0.16-aarch64-linux) + railties (>= 6.0.0) + tailwindcss-rails (2.0.16-arm64-darwin) + railties (>= 6.0.0) + tailwindcss-rails (2.0.16-x86_64-darwin) + railties (>= 6.0.0) + tailwindcss-rails (2.0.16-x86_64-linux) + railties (>= 6.0.0) + thor (1.5.0) + timeout (0.6.1) + tsort (0.2.0) + typhoeus (1.4.0) + ethon (>= 0.9.0) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + unf (0.1.4) + unf_ext + unf_ext (0.0.8.2) + unicode-display_width (2.3.0) + uri (1.1.2) + version_gem (1.1.17) + warden (1.2.9) + rack (>= 2.0.9) + web-console (4.2.0) + actionview (>= 6.0.0) + activemodel (>= 6.0.0) + bindex (>= 0.4.0) + railties (>= 6.0.0) + webdrivers (5.2.0) + nokogiri (~> 1.6) + rubyzip (>= 1.3.0) + selenium-webdriver (~> 4.0) + webrick (1.7.0) + webrobots (0.1.2) + websocket (1.2.9) + websocket-driver (0.9.0) + base64 + websocket-extensions (>= 0.2.0) + websocket-extensions (0.2.0) + xpath (3.2.0) + nokogiri (~> 1.8) + zeitwerk (2.8.3) + +PLATFORMS + aarch64-linux + arm64-darwin + arm64-darwin-25 + x86_64-darwin + x86_64-darwin-20 + x86_64-darwin-21 + x86_64-darwin-22 + x86_64-linux + +DEPENDENCIES + bootsnap + capybara (>= 2.15) + cssbundling-rails + debug + dotenv-rails + dotenv_validator + factory_bot_rails + guard-rspec + jsbundling-rails + mechanize + next_rails + ombu_labs-auth + ombu_labs-shortener + overcommit (= 0.57.0) + pagy + pg (~> 1.1) + propshaft + puma (~> 8.1) + rails (~> 7.1.0) + rails-controller-testing + reek + rspec-rails + rubocop-rails + rubocop-rspec + selenium-webdriver + simplecov + sitemap-parser! + standard + stimulus-rails + tailwindcss-rails + tzinfo-data + web-console + webdrivers + +RUBY VERSION + ruby 3.3.14p208 + +BUNDLED WITH + 2.5.22 diff --git a/config/environments/development.rb b/config/environments/development.rb index 22ed1b5..43aa1fc 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -6,7 +6,11 @@ # In the development environment your application's code is reloaded any time # it changes. This slows down response time but is perfect for development # since you don't have to restart the web server when you make code changes. - config.cache_classes = false + if NextRails.next? + config.enable_reloading = true + else + config.cache_classes = false + end # Do not eager load code on boot. config.eager_load = false diff --git a/config/environments/production.rb b/config/environments/production.rb index b09ea2c..6822496 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -4,7 +4,11 @@ # Settings specified here will take precedence over those in config/application.rb. # Code is not reloaded between requests. - config.cache_classes = true + if NextRails.next? + config.enable_reloading = false + else + config.cache_classes = true + end # Eager load code on boot. This eager loads most of Rails and # your application in memory, allowing both threaded web servers diff --git a/config/environments/test.rb b/config/environments/test.rb index eb2f171..f66425d 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -9,7 +9,11 @@ # Settings specified here will take precedence over those in config/application.rb. # Turn false under Spring and add config.action_view.cache_template_loading = true. - config.cache_classes = true + if NextRails.next? + config.enable_reloading = false + else + config.cache_classes = true + end # Eager loading loads your whole application. When running a single test locally, # this probably isn't necessary. It's a good idea to do in a continuous integration @@ -28,7 +32,11 @@ config.cache_store = :null_store # Raise exceptions instead of rendering exception templates. - config.action_dispatch.show_exceptions = false + if NextRails.next? + config.action_dispatch.show_exceptions = :none + else + config.action_dispatch.show_exceptions = false + end # Disable request forgery protection in test environment. config.action_controller.allow_forgery_protection = false From 81c11db0c747d0e88c34b8080f40bee55b2d0716 Mon Sep 17 00:00:00 2001 From: Ernesto Tagwerker Date: Fri, 20 Nov 2026 23:41:47 -0500 Subject: [PATCH 04/10] Promote Rails 7.1 to current, dual-boot with 7.2 - Gemfile: 7.1 current, 7.2 next - Collapse the 7.1 NextRails.next? branches (next side wins) - fixture_path -> fixture_paths (works on 7.1 and 7.2) Co-Authored-By: Claude Sonnet 5.5 --- Gemfile | 4 +- Gemfile.lock | 146 ++++++++++++++------------ Gemfile.next.lock | 158 +++++++++++++++-------------- config/environments/development.rb | 6 +- config/environments/production.rb | 6 +- config/environments/test.rb | 12 +-- spec/rails_helper.rb | 2 +- 7 files changed, 172 insertions(+), 162 deletions(-) diff --git a/Gemfile b/Gemfile index 0771c26..9b2f9d7 100644 --- a/Gemfile +++ b/Gemfile @@ -11,9 +11,9 @@ gem "next_rails" # Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main" if next? - gem "rails", "~> 7.1.0" + gem "rails", "~> 7.2.0" else - gem "rails", "~> 7.0.10" + gem "rails", "~> 7.1.0" end # Application Dependencies diff --git a/Gemfile.lock b/Gemfile.lock index 45becc6..e9b7c95 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -10,72 +10,78 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (7.0.10) - actionpack (= 7.0.10) - activesupport (= 7.0.10) + actioncable (7.1.6) + actionpack (= 7.1.6) + activesupport (= 7.1.6) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (7.0.10) - actionpack (= 7.0.10) - activejob (= 7.0.10) - activerecord (= 7.0.10) - activestorage (= 7.0.10) - activesupport (= 7.0.10) + zeitwerk (~> 2.6) + actionmailbox (7.1.6) + actionpack (= 7.1.6) + activejob (= 7.1.6) + activerecord (= 7.1.6) + activestorage (= 7.1.6) + activesupport (= 7.1.6) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.0.10) - actionpack (= 7.0.10) - actionview (= 7.0.10) - activejob (= 7.0.10) - activesupport (= 7.0.10) + actionmailer (7.1.6) + actionpack (= 7.1.6) + actionview (= 7.1.6) + activejob (= 7.1.6) + activesupport (= 7.1.6) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp - rails-dom-testing (~> 2.0) - actionpack (7.0.10) - actionview (= 7.0.10) - activesupport (= 7.0.10) + rails-dom-testing (~> 2.2) + actionpack (7.1.6) + actionview (= 7.1.6) + activesupport (= 7.1.6) + cgi + nokogiri (>= 1.8.5) racc - rack (~> 2.0, >= 2.2.4) + rack (>= 2.2.4) + rack-session (>= 1.0.1) rack-test (>= 0.6.3) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (7.0.10) - actionpack (= 7.0.10) - activerecord (= 7.0.10) - activestorage (= 7.0.10) - activesupport (= 7.0.10) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + actiontext (7.1.6) + actionpack (= 7.1.6) + activerecord (= 7.1.6) + activestorage (= 7.1.6) + activesupport (= 7.1.6) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.0.10) - activesupport (= 7.0.10) + actionview (7.1.6) + activesupport (= 7.1.6) builder (~> 3.1) - erubi (~> 1.4) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (7.0.10) - activesupport (= 7.0.10) + cgi + erubi (~> 1.11) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + activejob (7.1.6) + activesupport (= 7.1.6) globalid (>= 0.3.6) - activemodel (7.0.10) - activesupport (= 7.0.10) - activerecord (7.0.10) - activemodel (= 7.0.10) - activesupport (= 7.0.10) - activestorage (7.0.10) - actionpack (= 7.0.10) - activejob (= 7.0.10) - activerecord (= 7.0.10) - activesupport (= 7.0.10) + activemodel (7.1.6) + activesupport (= 7.1.6) + activerecord (7.1.6) + activemodel (= 7.1.6) + activesupport (= 7.1.6) + timeout (>= 0.4.0) + activestorage (7.1.6) + actionpack (= 7.1.6) + activejob (= 7.1.6) + activerecord (= 7.1.6) + activesupport (= 7.1.6) marcel (~> 1.0) - mini_mime (>= 1.1.0) - activesupport (7.0.10) + activesupport (7.1.6) base64 benchmark (>= 0.3) bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) + connection_pool (>= 2.2.5) drb i18n (>= 1.6, < 2) logger (>= 1.4.2) @@ -107,6 +113,7 @@ GEM rack-test (>= 0.6.3) regexp_parser (>= 1.5, < 3.0) xpath (~> 3.2) + cgi (0.5.2) childprocess (4.1.0) coderay (1.1.3) concurrent-ruby (1.3.8) @@ -326,22 +333,27 @@ GEM rack-protection (3.2.0) base64 (>= 0.1.0) rack (~> 2.2, >= 2.2.4) + rack-session (1.0.2) + rack (< 3) rack-test (2.3.0) rack (>= 1.3) - rails (7.0.10) - actioncable (= 7.0.10) - actionmailbox (= 7.0.10) - actionmailer (= 7.0.10) - actionpack (= 7.0.10) - actiontext (= 7.0.10) - actionview (= 7.0.10) - activejob (= 7.0.10) - activemodel (= 7.0.10) - activerecord (= 7.0.10) - activestorage (= 7.0.10) - activesupport (= 7.0.10) + rackup (1.0.1) + rack (< 3) + webrick + rails (7.1.6) + actioncable (= 7.1.6) + actionmailbox (= 7.1.6) + actionmailer (= 7.1.6) + actionpack (= 7.1.6) + actiontext (= 7.1.6) + actionview (= 7.1.6) + activejob (= 7.1.6) + activemodel (= 7.1.6) + activerecord (= 7.1.6) + activestorage (= 7.1.6) + activesupport (= 7.1.6) bundler (>= 1.15.0) - railties (= 7.0.10) + railties (= 7.1.6) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -353,13 +365,16 @@ GEM rails-html-sanitizer (1.7.2) loofah (~> 2.25, >= 2.25.3) nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0) - railties (7.0.10) - actionpack (= 7.0.10) - activesupport (= 7.0.10) - method_source + railties (7.1.6) + actionpack (= 7.1.6) + activesupport (= 7.1.6) + cgi + irb + rackup (>= 1.0.0) rake (>= 12.2) - thor (~> 1.0) - zeitwerk (~> 2.5) + thor (~> 1.0, >= 1.2.2) + tsort (>= 0.2) + zeitwerk (~> 2.6) rainbow (3.1.1) rake (13.4.2) rb-fsevent (0.11.2) @@ -454,6 +469,7 @@ GEM railties (>= 6.0.0) thor (1.5.0) timeout (0.6.1) + tsort (0.2.0) typhoeus (1.4.0) ethon (>= 0.9.0) tzinfo (2.0.6) @@ -515,7 +531,7 @@ DEPENDENCIES pg (~> 1.1) propshaft puma (~> 8.1) - rails (~> 7.0.10) + rails (~> 7.1.0) rails-controller-testing reek rspec-rails diff --git a/Gemfile.next.lock b/Gemfile.next.lock index e9b7c95..29502b0 100644 --- a/Gemfile.next.lock +++ b/Gemfile.next.lock @@ -10,85 +10,79 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (7.1.6) - actionpack (= 7.1.6) - activesupport (= 7.1.6) + actioncable (7.2.3) + actionpack (= 7.2.3) + activesupport (= 7.2.3) nio4r (~> 2.0) websocket-driver (>= 0.6.1) zeitwerk (~> 2.6) - actionmailbox (7.1.6) - actionpack (= 7.1.6) - activejob (= 7.1.6) - activerecord (= 7.1.6) - activestorage (= 7.1.6) - activesupport (= 7.1.6) - mail (>= 2.7.1) - net-imap - net-pop - net-smtp - actionmailer (7.1.6) - actionpack (= 7.1.6) - actionview (= 7.1.6) - activejob (= 7.1.6) - activesupport (= 7.1.6) - mail (~> 2.5, >= 2.5.4) - net-imap - net-pop - net-smtp + actionmailbox (7.2.3) + actionpack (= 7.2.3) + activejob (= 7.2.3) + activerecord (= 7.2.3) + activestorage (= 7.2.3) + activesupport (= 7.2.3) + mail (>= 2.8.0) + actionmailer (7.2.3) + actionpack (= 7.2.3) + actionview (= 7.2.3) + activejob (= 7.2.3) + activesupport (= 7.2.3) + mail (>= 2.8.0) rails-dom-testing (~> 2.2) - actionpack (7.1.6) - actionview (= 7.1.6) - activesupport (= 7.1.6) + actionpack (7.2.3) + actionview (= 7.2.3) + activesupport (= 7.2.3) cgi nokogiri (>= 1.8.5) racc - rack (>= 2.2.4) + rack (>= 2.2.4, < 3.3) rack-session (>= 1.0.1) rack-test (>= 0.6.3) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - actiontext (7.1.6) - actionpack (= 7.1.6) - activerecord (= 7.1.6) - activestorage (= 7.1.6) - activesupport (= 7.1.6) + useragent (~> 0.16) + actiontext (7.2.3) + actionpack (= 7.2.3) + activerecord (= 7.2.3) + activestorage (= 7.2.3) + activesupport (= 7.2.3) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.1.6) - activesupport (= 7.1.6) + actionview (7.2.3) + activesupport (= 7.2.3) builder (~> 3.1) cgi erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - activejob (7.1.6) - activesupport (= 7.1.6) + activejob (7.2.3) + activesupport (= 7.2.3) globalid (>= 0.3.6) - activemodel (7.1.6) - activesupport (= 7.1.6) - activerecord (7.1.6) - activemodel (= 7.1.6) - activesupport (= 7.1.6) + activemodel (7.2.3) + activesupport (= 7.2.3) + activerecord (7.2.3) + activemodel (= 7.2.3) + activesupport (= 7.2.3) timeout (>= 0.4.0) - activestorage (7.1.6) - actionpack (= 7.1.6) - activejob (= 7.1.6) - activerecord (= 7.1.6) - activesupport (= 7.1.6) + activestorage (7.2.3) + actionpack (= 7.2.3) + activejob (= 7.2.3) + activerecord (= 7.2.3) + activesupport (= 7.2.3) marcel (~> 1.0) - activesupport (7.1.6) + activesupport (7.2.3) base64 benchmark (>= 0.3) bigdecimal - concurrent-ruby (~> 1.0, >= 1.0.2) + concurrent-ruby (~> 1.0, >= 1.3.1) connection_pool (>= 2.2.5) drb i18n (>= 1.6, < 2) logger (>= 1.4.2) minitest (>= 5.1) - mutex_m securerandom (>= 0.3) - tzinfo (~> 2.0) + tzinfo (~> 2.0, >= 2.0.5) addressable (2.8.1) public_suffix (>= 2.0.2, < 6.0) anonymous_loader (0.1.5) @@ -117,7 +111,7 @@ GEM childprocess (4.1.0) coderay (1.1.3) concurrent-ruby (1.3.8) - connection_pool (2.3.0) + connection_pool (2.5.5) crass (1.0.8) cssbundling-rails (1.1.1) railties (>= 6.0.0) @@ -142,6 +136,7 @@ GEM dotenv_validator (1.2.0) fast_blank (~> 1.0.0) drb (2.2.3) + erb (6.0.7) erubi (1.13.1) ethon (0.15.0) ffi (>= 1.15.0) @@ -188,9 +183,12 @@ GEM i18n (1.15.2) concurrent-ruby (~> 1.0) iniparse (1.5.0) - io-console (0.5.11) - irb (1.4.2) - reline (>= 0.3.0) + io-console (0.9.5) + irb (1.19.0) + pp (>= 0.6.0) + prism (>= 1.3.0) + rdoc (>= 4.0.0) + reline (>= 0.4.2) jsbundling-rails (1.0.3) railties (>= 6.0.0) json (2.6.2) @@ -235,7 +233,6 @@ GEM msgpack (1.6.0) multi_xml (0.9.1) bigdecimal (>= 3.1, < 5) - mutex_m (0.3.0) nenv (0.3.0) net-http (0.10.0) net-protocol (>= 0.3.0) @@ -313,6 +310,9 @@ GEM parser (3.1.2.1) ast (~> 2.4.1) pg (1.4.3) + pp (0.6.4) + prettyprint + prettyprint (0.2.1) prism (2.1.0-aarch64-linux-gnu) prism (2.1.0-arm64-darwin) prism (2.1.0-x86_64-darwin) @@ -340,20 +340,20 @@ GEM rackup (1.0.1) rack (< 3) webrick - rails (7.1.6) - actioncable (= 7.1.6) - actionmailbox (= 7.1.6) - actionmailer (= 7.1.6) - actionpack (= 7.1.6) - actiontext (= 7.1.6) - actionview (= 7.1.6) - activejob (= 7.1.6) - activemodel (= 7.1.6) - activerecord (= 7.1.6) - activestorage (= 7.1.6) - activesupport (= 7.1.6) + rails (7.2.3) + actioncable (= 7.2.3) + actionmailbox (= 7.2.3) + actionmailer (= 7.2.3) + actionpack (= 7.2.3) + actiontext (= 7.2.3) + actionview (= 7.2.3) + activejob (= 7.2.3) + activemodel (= 7.2.3) + activerecord (= 7.2.3) + activestorage (= 7.2.3) + activesupport (= 7.2.3) bundler (>= 1.15.0) - railties (= 7.1.6) + railties (= 7.2.3) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -365,11 +365,11 @@ GEM rails-html-sanitizer (1.7.2) loofah (~> 2.25, >= 2.25.3) nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0) - railties (7.1.6) - actionpack (= 7.1.6) - activesupport (= 7.1.6) + railties (7.2.3) + actionpack (= 7.2.3) + activesupport (= 7.2.3) cgi - irb + irb (~> 1.13) rackup (>= 1.0.0) rake (>= 12.2) thor (~> 1.0, >= 1.2.2) @@ -380,6 +380,15 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) + rbs (4.2.0) + logger + prism (>= 1.6.0) + tsort + rdoc (8.1.0) + erb + prism (>= 1.6.0) + rbs (>= 4.0.0) + tsort rebrandly (0.1.5) httparty (~> 0.14) reek (6.1.1) @@ -387,7 +396,7 @@ GEM parser (~> 3.1.0) rainbow (>= 2.0, < 4.0) regexp_parser (2.6.0) - reline (0.3.1) + reline (0.7.0) io-console (~> 0.5) responders (3.2.1) actionpack (>= 7.0) @@ -479,6 +488,7 @@ GEM unf_ext (0.0.8.2) unicode-display_width (2.3.0) uri (1.1.2) + useragent (0.16.11) version_gem (1.1.17) warden (1.2.9) rack (>= 2.0.9) @@ -491,7 +501,7 @@ GEM nokogiri (~> 1.6) rubyzip (>= 1.3.0) selenium-webdriver (~> 4.0) - webrick (1.7.0) + webrick (1.9.2) webrobots (0.1.2) websocket (1.2.9) websocket-driver (0.9.0) @@ -531,7 +541,7 @@ DEPENDENCIES pg (~> 1.1) propshaft puma (~> 8.1) - rails (~> 7.1.0) + rails (~> 7.2.0) rails-controller-testing reek rspec-rails diff --git a/config/environments/development.rb b/config/environments/development.rb index 43aa1fc..776444e 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -6,11 +6,7 @@ # In the development environment your application's code is reloaded any time # it changes. This slows down response time but is perfect for development # since you don't have to restart the web server when you make code changes. - if NextRails.next? - config.enable_reloading = true - else - config.cache_classes = false - end + config.enable_reloading = true # Do not eager load code on boot. config.eager_load = false diff --git a/config/environments/production.rb b/config/environments/production.rb index 6822496..5d483e0 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -4,11 +4,7 @@ # Settings specified here will take precedence over those in config/application.rb. # Code is not reloaded between requests. - if NextRails.next? - config.enable_reloading = false - else - config.cache_classes = true - end + config.enable_reloading = false # Eager load code on boot. This eager loads most of Rails and # your application in memory, allowing both threaded web servers diff --git a/config/environments/test.rb b/config/environments/test.rb index f66425d..2439c4d 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -9,11 +9,7 @@ # Settings specified here will take precedence over those in config/application.rb. # Turn false under Spring and add config.action_view.cache_template_loading = true. - if NextRails.next? - config.enable_reloading = false - else - config.cache_classes = true - end + config.enable_reloading = false # Eager loading loads your whole application. When running a single test locally, # this probably isn't necessary. It's a good idea to do in a continuous integration @@ -32,11 +28,7 @@ config.cache_store = :null_store # Raise exceptions instead of rendering exception templates. - if NextRails.next? - config.action_dispatch.show_exceptions = :none - else - config.action_dispatch.show_exceptions = false - end + config.action_dispatch.show_exceptions = :none # Disable request forgery protection in test environment. config.action_controller.allow_forgery_protection = false diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index 0603156..3a00cc2 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -32,7 +32,7 @@ end RSpec.configure do |config| # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures - config.fixture_path = "#{::Rails.root}/spec/fixtures" + config.fixture_paths = ["#{::Rails.root}/spec/fixtures"] # If you're not using ActiveRecord, or you'd prefer not to run each of your # examples within a transaction, remove the following line or assign false From 7eef3094d2436a26fe5e5558df8408a3d70a7ece Mon Sep 17 00:00:00 2001 From: Ernesto Tagwerker Date: Fri, 20 Nov 2026 23:42:58 -0500 Subject: [PATCH 05/10] Promote Rails 7.2 to current, dual-boot with 8.0 - Gemfile: 7.2 current, 8.0 next - Set to_time_preserves_timezone to :zone (works on 7.2 and 8.0) Co-Authored-By: Claude Sonnet 5.5 --- Gemfile | 4 +- Gemfile.lock | 158 ++++++++++++++++++++++-------------------- Gemfile.next.lock | 118 +++++++++++++++---------------- config/application.rb | 3 + 4 files changed, 146 insertions(+), 137 deletions(-) diff --git a/Gemfile b/Gemfile index 9b2f9d7..002b150 100644 --- a/Gemfile +++ b/Gemfile @@ -11,9 +11,9 @@ gem "next_rails" # Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main" if next? - gem "rails", "~> 7.2.0" + gem "rails", "~> 8.0.0" else - gem "rails", "~> 7.1.0" + gem "rails", "~> 7.2.0" end # Application Dependencies diff --git a/Gemfile.lock b/Gemfile.lock index e9b7c95..29502b0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -10,85 +10,79 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (7.1.6) - actionpack (= 7.1.6) - activesupport (= 7.1.6) + actioncable (7.2.3) + actionpack (= 7.2.3) + activesupport (= 7.2.3) nio4r (~> 2.0) websocket-driver (>= 0.6.1) zeitwerk (~> 2.6) - actionmailbox (7.1.6) - actionpack (= 7.1.6) - activejob (= 7.1.6) - activerecord (= 7.1.6) - activestorage (= 7.1.6) - activesupport (= 7.1.6) - mail (>= 2.7.1) - net-imap - net-pop - net-smtp - actionmailer (7.1.6) - actionpack (= 7.1.6) - actionview (= 7.1.6) - activejob (= 7.1.6) - activesupport (= 7.1.6) - mail (~> 2.5, >= 2.5.4) - net-imap - net-pop - net-smtp + actionmailbox (7.2.3) + actionpack (= 7.2.3) + activejob (= 7.2.3) + activerecord (= 7.2.3) + activestorage (= 7.2.3) + activesupport (= 7.2.3) + mail (>= 2.8.0) + actionmailer (7.2.3) + actionpack (= 7.2.3) + actionview (= 7.2.3) + activejob (= 7.2.3) + activesupport (= 7.2.3) + mail (>= 2.8.0) rails-dom-testing (~> 2.2) - actionpack (7.1.6) - actionview (= 7.1.6) - activesupport (= 7.1.6) + actionpack (7.2.3) + actionview (= 7.2.3) + activesupport (= 7.2.3) cgi nokogiri (>= 1.8.5) racc - rack (>= 2.2.4) + rack (>= 2.2.4, < 3.3) rack-session (>= 1.0.1) rack-test (>= 0.6.3) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - actiontext (7.1.6) - actionpack (= 7.1.6) - activerecord (= 7.1.6) - activestorage (= 7.1.6) - activesupport (= 7.1.6) + useragent (~> 0.16) + actiontext (7.2.3) + actionpack (= 7.2.3) + activerecord (= 7.2.3) + activestorage (= 7.2.3) + activesupport (= 7.2.3) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.1.6) - activesupport (= 7.1.6) + actionview (7.2.3) + activesupport (= 7.2.3) builder (~> 3.1) cgi erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - activejob (7.1.6) - activesupport (= 7.1.6) + activejob (7.2.3) + activesupport (= 7.2.3) globalid (>= 0.3.6) - activemodel (7.1.6) - activesupport (= 7.1.6) - activerecord (7.1.6) - activemodel (= 7.1.6) - activesupport (= 7.1.6) + activemodel (7.2.3) + activesupport (= 7.2.3) + activerecord (7.2.3) + activemodel (= 7.2.3) + activesupport (= 7.2.3) timeout (>= 0.4.0) - activestorage (7.1.6) - actionpack (= 7.1.6) - activejob (= 7.1.6) - activerecord (= 7.1.6) - activesupport (= 7.1.6) + activestorage (7.2.3) + actionpack (= 7.2.3) + activejob (= 7.2.3) + activerecord (= 7.2.3) + activesupport (= 7.2.3) marcel (~> 1.0) - activesupport (7.1.6) + activesupport (7.2.3) base64 benchmark (>= 0.3) bigdecimal - concurrent-ruby (~> 1.0, >= 1.0.2) + concurrent-ruby (~> 1.0, >= 1.3.1) connection_pool (>= 2.2.5) drb i18n (>= 1.6, < 2) logger (>= 1.4.2) minitest (>= 5.1) - mutex_m securerandom (>= 0.3) - tzinfo (~> 2.0) + tzinfo (~> 2.0, >= 2.0.5) addressable (2.8.1) public_suffix (>= 2.0.2, < 6.0) anonymous_loader (0.1.5) @@ -117,7 +111,7 @@ GEM childprocess (4.1.0) coderay (1.1.3) concurrent-ruby (1.3.8) - connection_pool (2.3.0) + connection_pool (2.5.5) crass (1.0.8) cssbundling-rails (1.1.1) railties (>= 6.0.0) @@ -142,6 +136,7 @@ GEM dotenv_validator (1.2.0) fast_blank (~> 1.0.0) drb (2.2.3) + erb (6.0.7) erubi (1.13.1) ethon (0.15.0) ffi (>= 1.15.0) @@ -188,9 +183,12 @@ GEM i18n (1.15.2) concurrent-ruby (~> 1.0) iniparse (1.5.0) - io-console (0.5.11) - irb (1.4.2) - reline (>= 0.3.0) + io-console (0.9.5) + irb (1.19.0) + pp (>= 0.6.0) + prism (>= 1.3.0) + rdoc (>= 4.0.0) + reline (>= 0.4.2) jsbundling-rails (1.0.3) railties (>= 6.0.0) json (2.6.2) @@ -235,7 +233,6 @@ GEM msgpack (1.6.0) multi_xml (0.9.1) bigdecimal (>= 3.1, < 5) - mutex_m (0.3.0) nenv (0.3.0) net-http (0.10.0) net-protocol (>= 0.3.0) @@ -313,6 +310,9 @@ GEM parser (3.1.2.1) ast (~> 2.4.1) pg (1.4.3) + pp (0.6.4) + prettyprint + prettyprint (0.2.1) prism (2.1.0-aarch64-linux-gnu) prism (2.1.0-arm64-darwin) prism (2.1.0-x86_64-darwin) @@ -340,20 +340,20 @@ GEM rackup (1.0.1) rack (< 3) webrick - rails (7.1.6) - actioncable (= 7.1.6) - actionmailbox (= 7.1.6) - actionmailer (= 7.1.6) - actionpack (= 7.1.6) - actiontext (= 7.1.6) - actionview (= 7.1.6) - activejob (= 7.1.6) - activemodel (= 7.1.6) - activerecord (= 7.1.6) - activestorage (= 7.1.6) - activesupport (= 7.1.6) + rails (7.2.3) + actioncable (= 7.2.3) + actionmailbox (= 7.2.3) + actionmailer (= 7.2.3) + actionpack (= 7.2.3) + actiontext (= 7.2.3) + actionview (= 7.2.3) + activejob (= 7.2.3) + activemodel (= 7.2.3) + activerecord (= 7.2.3) + activestorage (= 7.2.3) + activesupport (= 7.2.3) bundler (>= 1.15.0) - railties (= 7.1.6) + railties (= 7.2.3) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -365,11 +365,11 @@ GEM rails-html-sanitizer (1.7.2) loofah (~> 2.25, >= 2.25.3) nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0) - railties (7.1.6) - actionpack (= 7.1.6) - activesupport (= 7.1.6) + railties (7.2.3) + actionpack (= 7.2.3) + activesupport (= 7.2.3) cgi - irb + irb (~> 1.13) rackup (>= 1.0.0) rake (>= 12.2) thor (~> 1.0, >= 1.2.2) @@ -380,6 +380,15 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) + rbs (4.2.0) + logger + prism (>= 1.6.0) + tsort + rdoc (8.1.0) + erb + prism (>= 1.6.0) + rbs (>= 4.0.0) + tsort rebrandly (0.1.5) httparty (~> 0.14) reek (6.1.1) @@ -387,7 +396,7 @@ GEM parser (~> 3.1.0) rainbow (>= 2.0, < 4.0) regexp_parser (2.6.0) - reline (0.3.1) + reline (0.7.0) io-console (~> 0.5) responders (3.2.1) actionpack (>= 7.0) @@ -479,6 +488,7 @@ GEM unf_ext (0.0.8.2) unicode-display_width (2.3.0) uri (1.1.2) + useragent (0.16.11) version_gem (1.1.17) warden (1.2.9) rack (>= 2.0.9) @@ -491,7 +501,7 @@ GEM nokogiri (~> 1.6) rubyzip (>= 1.3.0) selenium-webdriver (~> 4.0) - webrick (1.7.0) + webrick (1.9.2) webrobots (0.1.2) websocket (1.2.9) websocket-driver (0.9.0) @@ -531,7 +541,7 @@ DEPENDENCIES pg (~> 1.1) propshaft puma (~> 8.1) - rails (~> 7.1.0) + rails (~> 7.2.0) rails-controller-testing reek rspec-rails diff --git a/Gemfile.next.lock b/Gemfile.next.lock index 29502b0..c000cb9 100644 --- a/Gemfile.next.lock +++ b/Gemfile.next.lock @@ -10,68 +10,65 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (7.2.3) - actionpack (= 7.2.3) - activesupport (= 7.2.3) + actioncable (8.0.5.2) + actionpack (= 8.0.5.2) + activesupport (= 8.0.5.2) nio4r (~> 2.0) websocket-driver (>= 0.6.1) zeitwerk (~> 2.6) - actionmailbox (7.2.3) - actionpack (= 7.2.3) - activejob (= 7.2.3) - activerecord (= 7.2.3) - activestorage (= 7.2.3) - activesupport (= 7.2.3) + actionmailbox (8.0.5.2) + actionpack (= 8.0.5.2) + activejob (= 8.0.5.2) + activerecord (= 8.0.5.2) + activestorage (= 8.0.5.2) + activesupport (= 8.0.5.2) mail (>= 2.8.0) - actionmailer (7.2.3) - actionpack (= 7.2.3) - actionview (= 7.2.3) - activejob (= 7.2.3) - activesupport (= 7.2.3) + actionmailer (8.0.5.2) + actionpack (= 8.0.5.2) + actionview (= 8.0.5.2) + activejob (= 8.0.5.2) + activesupport (= 8.0.5.2) mail (>= 2.8.0) rails-dom-testing (~> 2.2) - actionpack (7.2.3) - actionview (= 7.2.3) - activesupport (= 7.2.3) - cgi + actionpack (8.0.5.2) + actionview (= 8.0.5.2) + activesupport (= 8.0.5.2) nokogiri (>= 1.8.5) - racc - rack (>= 2.2.4, < 3.3) + rack (>= 2.2.4) rack-session (>= 1.0.1) rack-test (>= 0.6.3) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) useragent (~> 0.16) - actiontext (7.2.3) - actionpack (= 7.2.3) - activerecord (= 7.2.3) - activestorage (= 7.2.3) - activesupport (= 7.2.3) + actiontext (8.0.5.2) + actionpack (= 8.0.5.2) + activerecord (= 8.0.5.2) + activestorage (= 8.0.5.2) + activesupport (= 8.0.5.2) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.2.3) - activesupport (= 7.2.3) + actionview (8.0.5.2) + activesupport (= 8.0.5.2) builder (~> 3.1) - cgi erubi (~> 1.11) rails-dom-testing (~> 2.2) - rails-html-sanitizer (~> 1.6) - activejob (7.2.3) - activesupport (= 7.2.3) + rails-html-sanitizer (~> 1.6, >= 1.7.2) + activejob (8.0.5.2) + activesupport (= 8.0.5.2) globalid (>= 0.3.6) - activemodel (7.2.3) - activesupport (= 7.2.3) - activerecord (7.2.3) - activemodel (= 7.2.3) - activesupport (= 7.2.3) + activemodel (8.0.5.2) + activesupport (= 8.0.5.2) + activerecord (8.0.5.2) + activemodel (= 8.0.5.2) + activesupport (= 8.0.5.2) timeout (>= 0.4.0) - activestorage (7.2.3) - actionpack (= 7.2.3) - activejob (= 7.2.3) - activerecord (= 7.2.3) - activesupport (= 7.2.3) + activestorage (8.0.5.2) + actionpack (= 8.0.5.2) + activejob (= 8.0.5.2) + activerecord (= 8.0.5.2) + activesupport (= 8.0.5.2) marcel (~> 1.0) - activesupport (7.2.3) + activesupport (8.0.5.2) base64 benchmark (>= 0.3) bigdecimal @@ -83,6 +80,7 @@ GEM minitest (>= 5.1) securerandom (>= 0.3) tzinfo (~> 2.0, >= 2.0.5) + uri (>= 0.13.1) addressable (2.8.1) public_suffix (>= 2.0.2, < 6.0) anonymous_loader (0.1.5) @@ -107,7 +105,6 @@ GEM rack-test (>= 0.6.3) regexp_parser (>= 1.5, < 3.0) xpath (~> 3.2) - cgi (0.5.2) childprocess (4.1.0) coderay (1.1.3) concurrent-ruby (1.3.8) @@ -340,20 +337,20 @@ GEM rackup (1.0.1) rack (< 3) webrick - rails (7.2.3) - actioncable (= 7.2.3) - actionmailbox (= 7.2.3) - actionmailer (= 7.2.3) - actionpack (= 7.2.3) - actiontext (= 7.2.3) - actionview (= 7.2.3) - activejob (= 7.2.3) - activemodel (= 7.2.3) - activerecord (= 7.2.3) - activestorage (= 7.2.3) - activesupport (= 7.2.3) + rails (8.0.5.2) + actioncable (= 8.0.5.2) + actionmailbox (= 8.0.5.2) + actionmailer (= 8.0.5.2) + actionpack (= 8.0.5.2) + actiontext (= 8.0.5.2) + actionview (= 8.0.5.2) + activejob (= 8.0.5.2) + activemodel (= 8.0.5.2) + activerecord (= 8.0.5.2) + activestorage (= 8.0.5.2) + activesupport (= 8.0.5.2) bundler (>= 1.15.0) - railties (= 7.2.3) + railties (= 8.0.5.2) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -365,10 +362,9 @@ GEM rails-html-sanitizer (1.7.2) loofah (~> 2.25, >= 2.25.3) nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0) - railties (7.2.3) - actionpack (= 7.2.3) - activesupport (= 7.2.3) - cgi + railties (8.0.5.2) + actionpack (= 8.0.5.2) + activesupport (= 8.0.5.2) irb (~> 1.13) rackup (>= 1.0.0) rake (>= 12.2) @@ -541,7 +537,7 @@ DEPENDENCIES pg (~> 1.1) propshaft puma (~> 8.1) - rails (~> 7.2.0) + rails (~> 8.0.0) rails-controller-testing reek rspec-rails diff --git a/config/application.rb b/config/application.rb index 2e31b7d..9380926 100644 --- a/config/application.rb +++ b/config/application.rb @@ -23,6 +23,9 @@ class Application < Rails::Application # Initialize configuration defaults for originally generated Rails version. config.load_defaults 7.0 + # Rails 8.0 deprecates `true`; `:zone` keeps the 7.0 default's intent + config.active_support.to_time_preserves_timezone = :zone + # Configuration for the application, engines, and railties goes here. # # These settings can be overridden in specific environments using the files From e94f03e059b4c328aa6d02fb1551e6faa90dcd4b Mon Sep 17 00:00:00 2001 From: Ernesto Tagwerker Date: Fri, 20 Nov 2026 23:44:24 -0500 Subject: [PATCH 06/10] Promote Rails 8.0 to current, dual-boot with 8.1 - Gemfile: 8.0 current, 8.1 next - database.yml: pool -> max_connections on 8.1 (two-sided, branches on NextRails.next?) - to_time_preserves_timezone override only on 8.0 (8.1 deprecates it) Co-Authored-By: Claude Sonnet 5.5 --- Gemfile | 4 +- Gemfile.lock | 118 ++++++++++++++++++++---------------------- Gemfile.next.lock | 114 ++++++++++++++++++++-------------------- config/application.rb | 7 ++- config/database.yml | 4 ++ 5 files changed, 126 insertions(+), 121 deletions(-) diff --git a/Gemfile b/Gemfile index 002b150..65368de 100644 --- a/Gemfile +++ b/Gemfile @@ -11,9 +11,9 @@ gem "next_rails" # Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main" if next? - gem "rails", "~> 8.0.0" + gem "rails", "~> 8.1.0" else - gem "rails", "~> 7.2.0" + gem "rails", "~> 8.0.0" end # Application Dependencies diff --git a/Gemfile.lock b/Gemfile.lock index 29502b0..c000cb9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -10,68 +10,65 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (7.2.3) - actionpack (= 7.2.3) - activesupport (= 7.2.3) + actioncable (8.0.5.2) + actionpack (= 8.0.5.2) + activesupport (= 8.0.5.2) nio4r (~> 2.0) websocket-driver (>= 0.6.1) zeitwerk (~> 2.6) - actionmailbox (7.2.3) - actionpack (= 7.2.3) - activejob (= 7.2.3) - activerecord (= 7.2.3) - activestorage (= 7.2.3) - activesupport (= 7.2.3) + actionmailbox (8.0.5.2) + actionpack (= 8.0.5.2) + activejob (= 8.0.5.2) + activerecord (= 8.0.5.2) + activestorage (= 8.0.5.2) + activesupport (= 8.0.5.2) mail (>= 2.8.0) - actionmailer (7.2.3) - actionpack (= 7.2.3) - actionview (= 7.2.3) - activejob (= 7.2.3) - activesupport (= 7.2.3) + actionmailer (8.0.5.2) + actionpack (= 8.0.5.2) + actionview (= 8.0.5.2) + activejob (= 8.0.5.2) + activesupport (= 8.0.5.2) mail (>= 2.8.0) rails-dom-testing (~> 2.2) - actionpack (7.2.3) - actionview (= 7.2.3) - activesupport (= 7.2.3) - cgi + actionpack (8.0.5.2) + actionview (= 8.0.5.2) + activesupport (= 8.0.5.2) nokogiri (>= 1.8.5) - racc - rack (>= 2.2.4, < 3.3) + rack (>= 2.2.4) rack-session (>= 1.0.1) rack-test (>= 0.6.3) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) useragent (~> 0.16) - actiontext (7.2.3) - actionpack (= 7.2.3) - activerecord (= 7.2.3) - activestorage (= 7.2.3) - activesupport (= 7.2.3) + actiontext (8.0.5.2) + actionpack (= 8.0.5.2) + activerecord (= 8.0.5.2) + activestorage (= 8.0.5.2) + activesupport (= 8.0.5.2) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.2.3) - activesupport (= 7.2.3) + actionview (8.0.5.2) + activesupport (= 8.0.5.2) builder (~> 3.1) - cgi erubi (~> 1.11) rails-dom-testing (~> 2.2) - rails-html-sanitizer (~> 1.6) - activejob (7.2.3) - activesupport (= 7.2.3) + rails-html-sanitizer (~> 1.6, >= 1.7.2) + activejob (8.0.5.2) + activesupport (= 8.0.5.2) globalid (>= 0.3.6) - activemodel (7.2.3) - activesupport (= 7.2.3) - activerecord (7.2.3) - activemodel (= 7.2.3) - activesupport (= 7.2.3) + activemodel (8.0.5.2) + activesupport (= 8.0.5.2) + activerecord (8.0.5.2) + activemodel (= 8.0.5.2) + activesupport (= 8.0.5.2) timeout (>= 0.4.0) - activestorage (7.2.3) - actionpack (= 7.2.3) - activejob (= 7.2.3) - activerecord (= 7.2.3) - activesupport (= 7.2.3) + activestorage (8.0.5.2) + actionpack (= 8.0.5.2) + activejob (= 8.0.5.2) + activerecord (= 8.0.5.2) + activesupport (= 8.0.5.2) marcel (~> 1.0) - activesupport (7.2.3) + activesupport (8.0.5.2) base64 benchmark (>= 0.3) bigdecimal @@ -83,6 +80,7 @@ GEM minitest (>= 5.1) securerandom (>= 0.3) tzinfo (~> 2.0, >= 2.0.5) + uri (>= 0.13.1) addressable (2.8.1) public_suffix (>= 2.0.2, < 6.0) anonymous_loader (0.1.5) @@ -107,7 +105,6 @@ GEM rack-test (>= 0.6.3) regexp_parser (>= 1.5, < 3.0) xpath (~> 3.2) - cgi (0.5.2) childprocess (4.1.0) coderay (1.1.3) concurrent-ruby (1.3.8) @@ -340,20 +337,20 @@ GEM rackup (1.0.1) rack (< 3) webrick - rails (7.2.3) - actioncable (= 7.2.3) - actionmailbox (= 7.2.3) - actionmailer (= 7.2.3) - actionpack (= 7.2.3) - actiontext (= 7.2.3) - actionview (= 7.2.3) - activejob (= 7.2.3) - activemodel (= 7.2.3) - activerecord (= 7.2.3) - activestorage (= 7.2.3) - activesupport (= 7.2.3) + rails (8.0.5.2) + actioncable (= 8.0.5.2) + actionmailbox (= 8.0.5.2) + actionmailer (= 8.0.5.2) + actionpack (= 8.0.5.2) + actiontext (= 8.0.5.2) + actionview (= 8.0.5.2) + activejob (= 8.0.5.2) + activemodel (= 8.0.5.2) + activerecord (= 8.0.5.2) + activestorage (= 8.0.5.2) + activesupport (= 8.0.5.2) bundler (>= 1.15.0) - railties (= 7.2.3) + railties (= 8.0.5.2) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -365,10 +362,9 @@ GEM rails-html-sanitizer (1.7.2) loofah (~> 2.25, >= 2.25.3) nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0) - railties (7.2.3) - actionpack (= 7.2.3) - activesupport (= 7.2.3) - cgi + railties (8.0.5.2) + actionpack (= 8.0.5.2) + activesupport (= 8.0.5.2) irb (~> 1.13) rackup (>= 1.0.0) rake (>= 12.2) @@ -541,7 +537,7 @@ DEPENDENCIES pg (~> 1.1) propshaft puma (~> 8.1) - rails (~> 7.2.0) + rails (~> 8.0.0) rails-controller-testing reek rspec-rails diff --git a/Gemfile.next.lock b/Gemfile.next.lock index c000cb9..3a93abd 100644 --- a/Gemfile.next.lock +++ b/Gemfile.next.lock @@ -10,29 +10,31 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (8.0.5.2) - actionpack (= 8.0.5.2) - activesupport (= 8.0.5.2) + action_text-trix (2.1.19) + railties + actioncable (8.1.4.1) + actionpack (= 8.1.4.1) + activesupport (= 8.1.4.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) zeitwerk (~> 2.6) - actionmailbox (8.0.5.2) - actionpack (= 8.0.5.2) - activejob (= 8.0.5.2) - activerecord (= 8.0.5.2) - activestorage (= 8.0.5.2) - activesupport (= 8.0.5.2) + actionmailbox (8.1.4.1) + actionpack (= 8.1.4.1) + activejob (= 8.1.4.1) + activerecord (= 8.1.4.1) + activestorage (= 8.1.4.1) + activesupport (= 8.1.4.1) mail (>= 2.8.0) - actionmailer (8.0.5.2) - actionpack (= 8.0.5.2) - actionview (= 8.0.5.2) - activejob (= 8.0.5.2) - activesupport (= 8.0.5.2) + actionmailer (8.1.4.1) + actionpack (= 8.1.4.1) + actionview (= 8.1.4.1) + activejob (= 8.1.4.1) + activesupport (= 8.1.4.1) mail (>= 2.8.0) rails-dom-testing (~> 2.2) - actionpack (8.0.5.2) - actionview (= 8.0.5.2) - activesupport (= 8.0.5.2) + actionpack (8.1.4.1) + actionview (= 8.1.4.1) + activesupport (= 8.1.4.1) nokogiri (>= 1.8.5) rack (>= 2.2.4) rack-session (>= 1.0.1) @@ -40,42 +42,43 @@ GEM rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) useragent (~> 0.16) - actiontext (8.0.5.2) - actionpack (= 8.0.5.2) - activerecord (= 8.0.5.2) - activestorage (= 8.0.5.2) - activesupport (= 8.0.5.2) + actiontext (8.1.4.1) + action_text-trix (~> 2.1.15) + actionpack (= 8.1.4.1) + activerecord (= 8.1.4.1) + activestorage (= 8.1.4.1) + activesupport (= 8.1.4.1) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (8.0.5.2) - activesupport (= 8.0.5.2) + actionview (8.1.4.1) + activesupport (= 8.1.4.1) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6, >= 1.7.2) - activejob (8.0.5.2) - activesupport (= 8.0.5.2) + activejob (8.1.4.1) + activesupport (= 8.1.4.1) globalid (>= 0.3.6) - activemodel (8.0.5.2) - activesupport (= 8.0.5.2) - activerecord (8.0.5.2) - activemodel (= 8.0.5.2) - activesupport (= 8.0.5.2) + activemodel (8.1.4.1) + activesupport (= 8.1.4.1) + activerecord (8.1.4.1) + activemodel (= 8.1.4.1) + activesupport (= 8.1.4.1) timeout (>= 0.4.0) - activestorage (8.0.5.2) - actionpack (= 8.0.5.2) - activejob (= 8.0.5.2) - activerecord (= 8.0.5.2) - activesupport (= 8.0.5.2) + activestorage (8.1.4.1) + actionpack (= 8.1.4.1) + activejob (= 8.1.4.1) + activerecord (= 8.1.4.1) + activesupport (= 8.1.4.1) marcel (~> 1.0) - activesupport (8.0.5.2) + activesupport (8.1.4.1) base64 - benchmark (>= 0.3) bigdecimal concurrent-ruby (~> 1.0, >= 1.3.1) connection_pool (>= 2.2.5) drb i18n (>= 1.6, < 2) + json logger (>= 1.4.2) minitest (>= 5.1) securerandom (>= 0.3) @@ -90,7 +93,6 @@ GEM version_gem (~> 1.1, >= 1.1.16) base64 (0.3.0) bcrypt (3.1.22) - benchmark (0.5.0) bigdecimal (4.1.3) bindex (0.8.1) bootsnap (1.13.0) @@ -337,20 +339,20 @@ GEM rackup (1.0.1) rack (< 3) webrick - rails (8.0.5.2) - actioncable (= 8.0.5.2) - actionmailbox (= 8.0.5.2) - actionmailer (= 8.0.5.2) - actionpack (= 8.0.5.2) - actiontext (= 8.0.5.2) - actionview (= 8.0.5.2) - activejob (= 8.0.5.2) - activemodel (= 8.0.5.2) - activerecord (= 8.0.5.2) - activestorage (= 8.0.5.2) - activesupport (= 8.0.5.2) + rails (8.1.4.1) + actioncable (= 8.1.4.1) + actionmailbox (= 8.1.4.1) + actionmailer (= 8.1.4.1) + actionpack (= 8.1.4.1) + actiontext (= 8.1.4.1) + actionview (= 8.1.4.1) + activejob (= 8.1.4.1) + activemodel (= 8.1.4.1) + activerecord (= 8.1.4.1) + activestorage (= 8.1.4.1) + activesupport (= 8.1.4.1) bundler (>= 1.15.0) - railties (= 8.0.5.2) + railties (= 8.1.4.1) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -362,9 +364,9 @@ GEM rails-html-sanitizer (1.7.2) loofah (~> 2.25, >= 2.25.3) nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0) - railties (8.0.5.2) - actionpack (= 8.0.5.2) - activesupport (= 8.0.5.2) + railties (8.1.4.1) + actionpack (= 8.1.4.1) + activesupport (= 8.1.4.1) irb (~> 1.13) rackup (>= 1.0.0) rake (>= 12.2) @@ -537,7 +539,7 @@ DEPENDENCIES pg (~> 1.1) propshaft puma (~> 8.1) - rails (~> 8.0.0) + rails (~> 8.1.0) rails-controller-testing reek rspec-rails diff --git a/config/application.rb b/config/application.rb index 9380926..5b53087 100644 --- a/config/application.rb +++ b/config/application.rb @@ -23,8 +23,11 @@ class Application < Rails::Application # Initialize configuration defaults for originally generated Rails version. config.load_defaults 7.0 - # Rails 8.0 deprecates `true`; `:zone` keeps the 7.0 default's intent - config.active_support.to_time_preserves_timezone = :zone + # Rails 8.0 deprecates `true`; `:zone` keeps the 7.0 default's intent. + # Rails 8.1 deprecates the setting itself. + unless NextRails.next? + config.active_support.to_time_preserves_timezone = :zone + end # Configuration for the application, engines, and railties goes here. # diff --git a/config/database.yml b/config/database.yml index 97f65dd..4c32125 100644 --- a/config/database.yml +++ b/config/database.yml @@ -19,7 +19,11 @@ default: &default encoding: unicode # For details on connection pooling, see Rails configuration guide # https://guides.rubyonrails.org/configuring.html#database-pooling + <% if NextRails.next? %> + max_connections: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + <% else %> pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + <% end %> port: <%= ENV.fetch("POSTGRES_PORT", 5432 )%> host: <%= ENV.fetch("POSTGRES_HOST", "localhost") %> username: postgres From 411b19283d6ba2cf6dd7f129b21422e9ce8a9d7e Mon Sep 17 00:00:00 2001 From: Ernesto Tagwerker Date: Fri, 20 Nov 2026 23:45:05 -0500 Subject: [PATCH 07/10] Promote Rails 8.1 to current - Gemfile: rails ~> 8.1.0 (8.1.4.1) on both sides - Collapse the 8.1 NextRails.next? branches (next side wins) The dual-boot scaffolding (next? helper, Gemfile.next, CI matrix) is still in place. The upgrade-cleanup skill removes it. Co-Authored-By: Claude Sonnet 5.5 --- Gemfile | 6 +-- Gemfile.lock | 114 +++++++++++++++++++++--------------------- config/application.rb | 6 --- config/database.yml | 4 -- 4 files changed, 59 insertions(+), 71 deletions(-) diff --git a/Gemfile b/Gemfile index 65368de..192420a 100644 --- a/Gemfile +++ b/Gemfile @@ -10,11 +10,7 @@ end gem "next_rails" # Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main" -if next? - gem "rails", "~> 8.1.0" -else - gem "rails", "~> 8.0.0" -end +gem "rails", "~> 8.1.0" # Application Dependencies gem "dotenv-rails" diff --git a/Gemfile.lock b/Gemfile.lock index c000cb9..3a93abd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -10,29 +10,31 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (8.0.5.2) - actionpack (= 8.0.5.2) - activesupport (= 8.0.5.2) + action_text-trix (2.1.19) + railties + actioncable (8.1.4.1) + actionpack (= 8.1.4.1) + activesupport (= 8.1.4.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) zeitwerk (~> 2.6) - actionmailbox (8.0.5.2) - actionpack (= 8.0.5.2) - activejob (= 8.0.5.2) - activerecord (= 8.0.5.2) - activestorage (= 8.0.5.2) - activesupport (= 8.0.5.2) + actionmailbox (8.1.4.1) + actionpack (= 8.1.4.1) + activejob (= 8.1.4.1) + activerecord (= 8.1.4.1) + activestorage (= 8.1.4.1) + activesupport (= 8.1.4.1) mail (>= 2.8.0) - actionmailer (8.0.5.2) - actionpack (= 8.0.5.2) - actionview (= 8.0.5.2) - activejob (= 8.0.5.2) - activesupport (= 8.0.5.2) + actionmailer (8.1.4.1) + actionpack (= 8.1.4.1) + actionview (= 8.1.4.1) + activejob (= 8.1.4.1) + activesupport (= 8.1.4.1) mail (>= 2.8.0) rails-dom-testing (~> 2.2) - actionpack (8.0.5.2) - actionview (= 8.0.5.2) - activesupport (= 8.0.5.2) + actionpack (8.1.4.1) + actionview (= 8.1.4.1) + activesupport (= 8.1.4.1) nokogiri (>= 1.8.5) rack (>= 2.2.4) rack-session (>= 1.0.1) @@ -40,42 +42,43 @@ GEM rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) useragent (~> 0.16) - actiontext (8.0.5.2) - actionpack (= 8.0.5.2) - activerecord (= 8.0.5.2) - activestorage (= 8.0.5.2) - activesupport (= 8.0.5.2) + actiontext (8.1.4.1) + action_text-trix (~> 2.1.15) + actionpack (= 8.1.4.1) + activerecord (= 8.1.4.1) + activestorage (= 8.1.4.1) + activesupport (= 8.1.4.1) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (8.0.5.2) - activesupport (= 8.0.5.2) + actionview (8.1.4.1) + activesupport (= 8.1.4.1) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6, >= 1.7.2) - activejob (8.0.5.2) - activesupport (= 8.0.5.2) + activejob (8.1.4.1) + activesupport (= 8.1.4.1) globalid (>= 0.3.6) - activemodel (8.0.5.2) - activesupport (= 8.0.5.2) - activerecord (8.0.5.2) - activemodel (= 8.0.5.2) - activesupport (= 8.0.5.2) + activemodel (8.1.4.1) + activesupport (= 8.1.4.1) + activerecord (8.1.4.1) + activemodel (= 8.1.4.1) + activesupport (= 8.1.4.1) timeout (>= 0.4.0) - activestorage (8.0.5.2) - actionpack (= 8.0.5.2) - activejob (= 8.0.5.2) - activerecord (= 8.0.5.2) - activesupport (= 8.0.5.2) + activestorage (8.1.4.1) + actionpack (= 8.1.4.1) + activejob (= 8.1.4.1) + activerecord (= 8.1.4.1) + activesupport (= 8.1.4.1) marcel (~> 1.0) - activesupport (8.0.5.2) + activesupport (8.1.4.1) base64 - benchmark (>= 0.3) bigdecimal concurrent-ruby (~> 1.0, >= 1.3.1) connection_pool (>= 2.2.5) drb i18n (>= 1.6, < 2) + json logger (>= 1.4.2) minitest (>= 5.1) securerandom (>= 0.3) @@ -90,7 +93,6 @@ GEM version_gem (~> 1.1, >= 1.1.16) base64 (0.3.0) bcrypt (3.1.22) - benchmark (0.5.0) bigdecimal (4.1.3) bindex (0.8.1) bootsnap (1.13.0) @@ -337,20 +339,20 @@ GEM rackup (1.0.1) rack (< 3) webrick - rails (8.0.5.2) - actioncable (= 8.0.5.2) - actionmailbox (= 8.0.5.2) - actionmailer (= 8.0.5.2) - actionpack (= 8.0.5.2) - actiontext (= 8.0.5.2) - actionview (= 8.0.5.2) - activejob (= 8.0.5.2) - activemodel (= 8.0.5.2) - activerecord (= 8.0.5.2) - activestorage (= 8.0.5.2) - activesupport (= 8.0.5.2) + rails (8.1.4.1) + actioncable (= 8.1.4.1) + actionmailbox (= 8.1.4.1) + actionmailer (= 8.1.4.1) + actionpack (= 8.1.4.1) + actiontext (= 8.1.4.1) + actionview (= 8.1.4.1) + activejob (= 8.1.4.1) + activemodel (= 8.1.4.1) + activerecord (= 8.1.4.1) + activestorage (= 8.1.4.1) + activesupport (= 8.1.4.1) bundler (>= 1.15.0) - railties (= 8.0.5.2) + railties (= 8.1.4.1) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -362,9 +364,9 @@ GEM rails-html-sanitizer (1.7.2) loofah (~> 2.25, >= 2.25.3) nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0) - railties (8.0.5.2) - actionpack (= 8.0.5.2) - activesupport (= 8.0.5.2) + railties (8.1.4.1) + actionpack (= 8.1.4.1) + activesupport (= 8.1.4.1) irb (~> 1.13) rackup (>= 1.0.0) rake (>= 12.2) @@ -537,7 +539,7 @@ DEPENDENCIES pg (~> 1.1) propshaft puma (~> 8.1) - rails (~> 8.0.0) + rails (~> 8.1.0) rails-controller-testing reek rspec-rails diff --git a/config/application.rb b/config/application.rb index 5b53087..2e31b7d 100644 --- a/config/application.rb +++ b/config/application.rb @@ -23,12 +23,6 @@ class Application < Rails::Application # Initialize configuration defaults for originally generated Rails version. config.load_defaults 7.0 - # Rails 8.0 deprecates `true`; `:zone` keeps the 7.0 default's intent. - # Rails 8.1 deprecates the setting itself. - unless NextRails.next? - config.active_support.to_time_preserves_timezone = :zone - end - # Configuration for the application, engines, and railties goes here. # # These settings can be overridden in specific environments using the files diff --git a/config/database.yml b/config/database.yml index 4c32125..901fb52 100644 --- a/config/database.yml +++ b/config/database.yml @@ -19,11 +19,7 @@ default: &default encoding: unicode # For details on connection pooling, see Rails configuration guide # https://guides.rubyonrails.org/configuring.html#database-pooling - <% if NextRails.next? %> max_connections: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> - <% else %> - pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> - <% end %> port: <%= ENV.fetch("POSTGRES_PORT", 5432 )%> host: <%= ENV.fetch("POSTGRES_HOST", "localhost") %> username: postgres From 0579289c2e8dd4155e7f6ac8acdb43deb8f378a5 Mon Sep 17 00:00:00 2001 From: Ernesto Tagwerker Date: Sat, 21 Nov 2026 21:20:26 -0500 Subject: [PATCH 08/10] bump version of sitemap-parser and use it straight from rubygems.org --- Gemfile | 3 +-- Gemfile.lock | 21 ++++++++------------- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/Gemfile b/Gemfile index 192420a..35f191e 100644 --- a/Gemfile +++ b/Gemfile @@ -15,8 +15,7 @@ gem "rails", "~> 8.1.0" # Application Dependencies gem "dotenv-rails" gem "mechanize" -gem "sitemap-parser", github: "fastruby/sitemap-parser", - branch: "fixes/recurse-to-level-n" +gem "sitemap-parser" gem "ombu_labs-shortener" gem "ombu_labs-auth" diff --git a/Gemfile.lock b/Gemfile.lock index 3a93abd..df0b939 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,3 @@ -GIT - remote: https://github.com/fastruby/sitemap-parser.git - revision: 5c7a74c0e4d69f63d277f6e1c8163ffa3566ca07 - branch: fixes/recurse-to-level-n - specs: - sitemap-parser (0.5.6) - nokogiri (~> 1.6) - typhoeus (>= 0.6, < 2.0) - GEM remote: https://rubygems.org/ specs: @@ -137,8 +128,9 @@ GEM drb (2.2.3) erb (6.0.7) erubi (1.13.1) - ethon (0.15.0) + ethon (0.19.2) ffi (>= 1.15.0) + logger factory_bot (6.2.1) activesupport (>= 5.0.0) factory_bot_rails (6.2.0) @@ -458,6 +450,9 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) + sitemap-parser (0.6.0) + nokogiri (>= 1.6) + typhoeus (>= 0.6, < 2.0) snaky_hash (2.0.9) hashie (>= 0.1.0, < 6) version_gem (~> 1.1, >= 1.1.16) @@ -477,8 +472,8 @@ GEM thor (1.5.0) timeout (0.6.1) tsort (0.2.0) - typhoeus (1.4.0) - ethon (>= 0.9.0) + typhoeus (1.8.0) + ethon (>= 0.19.2, < 0.20.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) unf (0.1.4) @@ -547,7 +542,7 @@ DEPENDENCIES rubocop-rspec selenium-webdriver simplecov - sitemap-parser! + sitemap-parser standard stimulus-rails tailwindcss-rails From 2a2c287c4099189ded6db9c44126953a71c470c8 Mon Sep 17 00:00:00 2001 From: Ernesto Tagwerker Date: Sat, 21 Nov 2026 21:24:41 -0500 Subject: [PATCH 09/10] Revert "Promote Rails 8.1 to current" Back to Rails 8.0 as current with 8.1 as the next (dual-boot) version, so the PR ships 8.0 and keeps 8.1 ready to flip. Co-Authored-By: Claude Sonnet 5.5 --- Gemfile | 6 ++- Gemfile.lock | 114 +++++++++++++++++++++--------------------- config/application.rb | 6 +++ config/database.yml | 4 ++ 4 files changed, 71 insertions(+), 59 deletions(-) diff --git a/Gemfile b/Gemfile index 35f191e..c5671dd 100644 --- a/Gemfile +++ b/Gemfile @@ -10,7 +10,11 @@ end gem "next_rails" # Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main" -gem "rails", "~> 8.1.0" +if next? + gem "rails", "~> 8.1.0" +else + gem "rails", "~> 8.0.0" +end # Application Dependencies gem "dotenv-rails" diff --git a/Gemfile.lock b/Gemfile.lock index df0b939..36b12d9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,31 +1,29 @@ GEM remote: https://rubygems.org/ specs: - action_text-trix (2.1.19) - railties - actioncable (8.1.4.1) - actionpack (= 8.1.4.1) - activesupport (= 8.1.4.1) + actioncable (8.0.5.2) + actionpack (= 8.0.5.2) + activesupport (= 8.0.5.2) nio4r (~> 2.0) websocket-driver (>= 0.6.1) zeitwerk (~> 2.6) - actionmailbox (8.1.4.1) - actionpack (= 8.1.4.1) - activejob (= 8.1.4.1) - activerecord (= 8.1.4.1) - activestorage (= 8.1.4.1) - activesupport (= 8.1.4.1) + actionmailbox (8.0.5.2) + actionpack (= 8.0.5.2) + activejob (= 8.0.5.2) + activerecord (= 8.0.5.2) + activestorage (= 8.0.5.2) + activesupport (= 8.0.5.2) mail (>= 2.8.0) - actionmailer (8.1.4.1) - actionpack (= 8.1.4.1) - actionview (= 8.1.4.1) - activejob (= 8.1.4.1) - activesupport (= 8.1.4.1) + actionmailer (8.0.5.2) + actionpack (= 8.0.5.2) + actionview (= 8.0.5.2) + activejob (= 8.0.5.2) + activesupport (= 8.0.5.2) mail (>= 2.8.0) rails-dom-testing (~> 2.2) - actionpack (8.1.4.1) - actionview (= 8.1.4.1) - activesupport (= 8.1.4.1) + actionpack (8.0.5.2) + actionview (= 8.0.5.2) + activesupport (= 8.0.5.2) nokogiri (>= 1.8.5) rack (>= 2.2.4) rack-session (>= 1.0.1) @@ -33,43 +31,42 @@ GEM rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) useragent (~> 0.16) - actiontext (8.1.4.1) - action_text-trix (~> 2.1.15) - actionpack (= 8.1.4.1) - activerecord (= 8.1.4.1) - activestorage (= 8.1.4.1) - activesupport (= 8.1.4.1) + actiontext (8.0.5.2) + actionpack (= 8.0.5.2) + activerecord (= 8.0.5.2) + activestorage (= 8.0.5.2) + activesupport (= 8.0.5.2) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (8.1.4.1) - activesupport (= 8.1.4.1) + actionview (8.0.5.2) + activesupport (= 8.0.5.2) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6, >= 1.7.2) - activejob (8.1.4.1) - activesupport (= 8.1.4.1) + activejob (8.0.5.2) + activesupport (= 8.0.5.2) globalid (>= 0.3.6) - activemodel (8.1.4.1) - activesupport (= 8.1.4.1) - activerecord (8.1.4.1) - activemodel (= 8.1.4.1) - activesupport (= 8.1.4.1) + activemodel (8.0.5.2) + activesupport (= 8.0.5.2) + activerecord (8.0.5.2) + activemodel (= 8.0.5.2) + activesupport (= 8.0.5.2) timeout (>= 0.4.0) - activestorage (8.1.4.1) - actionpack (= 8.1.4.1) - activejob (= 8.1.4.1) - activerecord (= 8.1.4.1) - activesupport (= 8.1.4.1) + activestorage (8.0.5.2) + actionpack (= 8.0.5.2) + activejob (= 8.0.5.2) + activerecord (= 8.0.5.2) + activesupport (= 8.0.5.2) marcel (~> 1.0) - activesupport (8.1.4.1) + activesupport (8.0.5.2) base64 + benchmark (>= 0.3) bigdecimal concurrent-ruby (~> 1.0, >= 1.3.1) connection_pool (>= 2.2.5) drb i18n (>= 1.6, < 2) - json logger (>= 1.4.2) minitest (>= 5.1) securerandom (>= 0.3) @@ -84,6 +81,7 @@ GEM version_gem (~> 1.1, >= 1.1.16) base64 (0.3.0) bcrypt (3.1.22) + benchmark (0.5.0) bigdecimal (4.1.3) bindex (0.8.1) bootsnap (1.13.0) @@ -331,20 +329,20 @@ GEM rackup (1.0.1) rack (< 3) webrick - rails (8.1.4.1) - actioncable (= 8.1.4.1) - actionmailbox (= 8.1.4.1) - actionmailer (= 8.1.4.1) - actionpack (= 8.1.4.1) - actiontext (= 8.1.4.1) - actionview (= 8.1.4.1) - activejob (= 8.1.4.1) - activemodel (= 8.1.4.1) - activerecord (= 8.1.4.1) - activestorage (= 8.1.4.1) - activesupport (= 8.1.4.1) + rails (8.0.5.2) + actioncable (= 8.0.5.2) + actionmailbox (= 8.0.5.2) + actionmailer (= 8.0.5.2) + actionpack (= 8.0.5.2) + actiontext (= 8.0.5.2) + actionview (= 8.0.5.2) + activejob (= 8.0.5.2) + activemodel (= 8.0.5.2) + activerecord (= 8.0.5.2) + activestorage (= 8.0.5.2) + activesupport (= 8.0.5.2) bundler (>= 1.15.0) - railties (= 8.1.4.1) + railties (= 8.0.5.2) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -356,9 +354,9 @@ GEM rails-html-sanitizer (1.7.2) loofah (~> 2.25, >= 2.25.3) nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0) - railties (8.1.4.1) - actionpack (= 8.1.4.1) - activesupport (= 8.1.4.1) + railties (8.0.5.2) + actionpack (= 8.0.5.2) + activesupport (= 8.0.5.2) irb (~> 1.13) rackup (>= 1.0.0) rake (>= 12.2) @@ -534,7 +532,7 @@ DEPENDENCIES pg (~> 1.1) propshaft puma (~> 8.1) - rails (~> 8.1.0) + rails (~> 8.0.0) rails-controller-testing reek rspec-rails diff --git a/config/application.rb b/config/application.rb index 2e31b7d..5b53087 100644 --- a/config/application.rb +++ b/config/application.rb @@ -23,6 +23,12 @@ class Application < Rails::Application # Initialize configuration defaults for originally generated Rails version. config.load_defaults 7.0 + # Rails 8.0 deprecates `true`; `:zone` keeps the 7.0 default's intent. + # Rails 8.1 deprecates the setting itself. + unless NextRails.next? + config.active_support.to_time_preserves_timezone = :zone + end + # Configuration for the application, engines, and railties goes here. # # These settings can be overridden in specific environments using the files diff --git a/config/database.yml b/config/database.yml index 901fb52..4c32125 100644 --- a/config/database.yml +++ b/config/database.yml @@ -19,7 +19,11 @@ default: &default encoding: unicode # For details on connection pooling, see Rails configuration guide # https://guides.rubyonrails.org/configuring.html#database-pooling + <% if NextRails.next? %> max_connections: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + <% else %> + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + <% end %> port: <%= ENV.fetch("POSTGRES_PORT", 5432 )%> host: <%= ENV.fetch("POSTGRES_HOST", "localhost") %> username: postgres From 84c05509f1813418135a162d337116b6964e00e8 Mon Sep 17 00:00:00 2001 From: Ernesto Tagwerker Date: Sat, 21 Nov 2026 21:26:41 -0500 Subject: [PATCH 10/10] Sync Gemfile.next.lock with sitemap-parser from rubygems The next lockfile still pointed at the GitHub fork after sitemap-parser moved to rubygems.org. Re-derived it from Gemfile.lock and re-resolved Rails 8.1. Co-Authored-By: Claude Sonnet 5.5 --- Gemfile.next.lock | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/Gemfile.next.lock b/Gemfile.next.lock index 3a93abd..df0b939 100644 --- a/Gemfile.next.lock +++ b/Gemfile.next.lock @@ -1,12 +1,3 @@ -GIT - remote: https://github.com/fastruby/sitemap-parser.git - revision: 5c7a74c0e4d69f63d277f6e1c8163ffa3566ca07 - branch: fixes/recurse-to-level-n - specs: - sitemap-parser (0.5.6) - nokogiri (~> 1.6) - typhoeus (>= 0.6, < 2.0) - GEM remote: https://rubygems.org/ specs: @@ -137,8 +128,9 @@ GEM drb (2.2.3) erb (6.0.7) erubi (1.13.1) - ethon (0.15.0) + ethon (0.19.2) ffi (>= 1.15.0) + logger factory_bot (6.2.1) activesupport (>= 5.0.0) factory_bot_rails (6.2.0) @@ -458,6 +450,9 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) + sitemap-parser (0.6.0) + nokogiri (>= 1.6) + typhoeus (>= 0.6, < 2.0) snaky_hash (2.0.9) hashie (>= 0.1.0, < 6) version_gem (~> 1.1, >= 1.1.16) @@ -477,8 +472,8 @@ GEM thor (1.5.0) timeout (0.6.1) tsort (0.2.0) - typhoeus (1.4.0) - ethon (>= 0.9.0) + typhoeus (1.8.0) + ethon (>= 0.19.2, < 0.20.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) unf (0.1.4) @@ -547,7 +542,7 @@ DEPENDENCIES rubocop-rspec selenium-webdriver simplecov - sitemap-parser! + sitemap-parser standard stimulus-rails tailwindcss-rails