From 5259845726ceb0571c94626b761794488392f818 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Fri, 9 Jan 2026 22:40:46 +0000 Subject: [PATCH 1/2] Update all of rails to version 8.1.2 --- Gemfile.lock | 114 +++++++++++++++++++++++++-------------------------- 1 file changed, 57 insertions(+), 57 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7a7b6e1..7bbea96 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -5,29 +5,29 @@ GEM concurrent-ruby (~> 1.0) action_text-trix (2.1.16) railties - actioncable (8.1.1) - actionpack (= 8.1.1) - activesupport (= 8.1.1) + actioncable (8.1.2) + actionpack (= 8.1.2) + activesupport (= 8.1.2) nio4r (~> 2.0) websocket-driver (>= 0.6.1) zeitwerk (~> 2.6) - actionmailbox (8.1.1) - actionpack (= 8.1.1) - activejob (= 8.1.1) - activerecord (= 8.1.1) - activestorage (= 8.1.1) - activesupport (= 8.1.1) + actionmailbox (8.1.2) + actionpack (= 8.1.2) + activejob (= 8.1.2) + activerecord (= 8.1.2) + activestorage (= 8.1.2) + activesupport (= 8.1.2) mail (>= 2.8.0) - actionmailer (8.1.1) - actionpack (= 8.1.1) - actionview (= 8.1.1) - activejob (= 8.1.1) - activesupport (= 8.1.1) + actionmailer (8.1.2) + actionpack (= 8.1.2) + actionview (= 8.1.2) + activejob (= 8.1.2) + activesupport (= 8.1.2) mail (>= 2.8.0) rails-dom-testing (~> 2.2) - actionpack (8.1.1) - actionview (= 8.1.1) - activesupport (= 8.1.1) + actionpack (8.1.2) + actionview (= 8.1.2) + activesupport (= 8.1.2) nokogiri (>= 1.8.5) rack (>= 2.2.4) rack-session (>= 1.0.1) @@ -35,36 +35,36 @@ GEM rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) useragent (~> 0.16) - actiontext (8.1.1) + actiontext (8.1.2) action_text-trix (~> 2.1.15) - actionpack (= 8.1.1) - activerecord (= 8.1.1) - activestorage (= 8.1.1) - activesupport (= 8.1.1) + actionpack (= 8.1.2) + activerecord (= 8.1.2) + activestorage (= 8.1.2) + activesupport (= 8.1.2) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (8.1.1) - activesupport (= 8.1.1) + actionview (8.1.2) + activesupport (= 8.1.2) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - activejob (8.1.1) - activesupport (= 8.1.1) + activejob (8.1.2) + activesupport (= 8.1.2) globalid (>= 0.3.6) - activemodel (8.1.1) - activesupport (= 8.1.1) - activerecord (8.1.1) - activemodel (= 8.1.1) - activesupport (= 8.1.1) + activemodel (8.1.2) + activesupport (= 8.1.2) + activerecord (8.1.2) + activemodel (= 8.1.2) + activesupport (= 8.1.2) timeout (>= 0.4.0) - activestorage (8.1.1) - actionpack (= 8.1.1) - activejob (= 8.1.1) - activerecord (= 8.1.1) - activesupport (= 8.1.1) + activestorage (8.1.2) + actionpack (= 8.1.2) + activejob (= 8.1.2) + activerecord (= 8.1.2) + activesupport (= 8.1.2) marcel (~> 1.0) - activesupport (8.1.1) + activesupport (8.1.2) base64 bigdecimal concurrent-ruby (~> 1.0, >= 1.3.1) @@ -164,7 +164,7 @@ GEM msgpack (1.8.0) net-http (0.6.0) uri - net-imap (0.5.12) + net-imap (0.6.2) date net-protocol net-pop (0.1.2) @@ -173,7 +173,7 @@ GEM timeout net-smtp (0.5.1) net-protocol - nio4r (2.7.4) + nio4r (2.7.5) nokogiri (1.19.0) mini_portile2 (~> 2.8.2) racc (~> 1.4) @@ -201,20 +201,20 @@ GEM rack (>= 1.3) rackup (2.3.1) rack (>= 3) - rails (8.1.1) - actioncable (= 8.1.1) - actionmailbox (= 8.1.1) - actionmailer (= 8.1.1) - actionpack (= 8.1.1) - actiontext (= 8.1.1) - actionview (= 8.1.1) - activejob (= 8.1.1) - activemodel (= 8.1.1) - activerecord (= 8.1.1) - activestorage (= 8.1.1) - activesupport (= 8.1.1) + rails (8.1.2) + actioncable (= 8.1.2) + actionmailbox (= 8.1.2) + actionmailer (= 8.1.2) + actionpack (= 8.1.2) + actiontext (= 8.1.2) + actionview (= 8.1.2) + activejob (= 8.1.2) + activemodel (= 8.1.2) + activerecord (= 8.1.2) + activestorage (= 8.1.2) + activesupport (= 8.1.2) bundler (>= 1.15.0) - railties (= 8.1.1) + railties (= 8.1.2) rails-dom-testing (2.3.0) activesupport (>= 5.0.0) minitest @@ -222,9 +222,9 @@ GEM rails-html-sanitizer (1.6.2) loofah (~> 2.21) 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.1) - actionpack (= 8.1.1) - activesupport (= 8.1.1) + railties (8.1.2) + actionpack (= 8.1.2) + activesupport (= 8.1.2) irb (~> 1.13) rackup (>= 1.0.0) rake (>= 12.2) @@ -322,10 +322,10 @@ GEM activesupport (>= 6.1) sprockets (>= 3.0.0) stringio (3.2.0) - thor (1.4.0) + thor (1.5.0) thruster (0.1.17) tilt (2.3.0) - timeout (0.4.4) + timeout (0.6.0) trestle (0.10.1) activemodel (>= 6.0.0) kaminari (>= 1.1.0) From 22be232ba12462985a141298a0473edb0692b36b Mon Sep 17 00:00:00 2001 From: Klaus Meyer Date: Mon, 12 Jan 2026 17:17:21 +0100 Subject: [PATCH 2/2] https://railsdiff.org/8.1.1/8.1.2 and more --- Dockerfile | 3 ++- Gemfile | 2 +- Gemfile.lock | 2 +- config/ci.rb | 3 +++ config/initializers/monkey_patch_ar_schema_dumper.rb | 2 +- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index b05b6a2..5369b25 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,7 +36,8 @@ RUN apt-get update -qq && \ rm -rf /var/lib/apt/lists /var/cache/apt/archives # Install application gems -COPY Gemfile Gemfile.lock vendor ./ +COPY vendor/* ./vendor/ +COPY Gemfile Gemfile.lock ./ RUN bundle install && \ rm -rf ~/.bundle/ "${BUNDLE_PATH}"/ruby/*/cache "${BUNDLE_PATH}"/ruby/*/bundler/gems/*/.git && \ diff --git a/Gemfile b/Gemfile index 22b46a0..621c465 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" # Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main" -gem "rails", "~> 8.1.0" +gem "rails", "~> 8.1.2" # The modern asset pipeline for Rails [https://github.com/rails/propshaft] # gem "propshaft" # Use postgresql as the database for Active Record diff --git a/Gemfile.lock b/Gemfile.lock index 7bbea96..34abb33 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -373,7 +373,7 @@ DEPENDENCIES health_check (~> 3.1) pg (~> 1.1) puma (>= 5.0) - rails (~> 8.1.0) + rails (~> 8.1.2) redis (>= 4.0.1) rouge (~> 4.0) rspec-rails (~> 8.0) diff --git a/config/ci.rb b/config/ci.rb index 3d9d80b..6ee9006 100644 --- a/config/ci.rb +++ b/config/ci.rb @@ -9,6 +9,9 @@ step "Tests: Rails", "bin/rails spec" step "Tests: Seeds", "env RAILS_ENV=test bin/rails db:seed:replant" + # Optional: Run system tests + # step "Tests: System", "bin/rails test:system" + # Optional: set a green GitHub commit status to unblock PR merge. # Requires the `gh` CLI and `gh extension install basecamp/gh-signoff`. # if success? diff --git a/config/initializers/monkey_patch_ar_schema_dumper.rb b/config/initializers/monkey_patch_ar_schema_dumper.rb index 0105c37..fbf8884 100644 --- a/config/initializers/monkey_patch_ar_schema_dumper.rb +++ b/config/initializers/monkey_patch_ar_schema_dumper.rb @@ -20,7 +20,7 @@ def columns_array.sort_by(*) = self end end -if Rails.version.to_s == "8.1.1" +if Rails.version.to_s == "8.1.2" ActiveRecord::SchemaDumper.prepend MonkeyPatches::DisableSortedColumnsInSchema else warn "WARNING: It looks like Rails has been changed since `ActiveRecord::SchemaDumper` was monkey-patched in #{__FILE__}. Please re-evaluate the patch."