From c328aaf00bfde2c1f5a41a5cf98c751d898951d3 Mon Sep 17 00:00:00 2001 From: Thibaud Guillaume-Gentil Date: Sat, 11 Nov 2023 10:52:53 +0100 Subject: [PATCH] Rails 7.1.2 upgrade --- Gemfile | 2 +- Gemfile.lock | 156 +++++++++++++++++++++++++-------------------------- 2 files changed, 76 insertions(+), 82 deletions(-) diff --git a/Gemfile b/Gemfile index 228f3c0a2..1fe0b6e3e 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' ruby '3.2.2' -gem 'rails', github: 'rails/rails', branch: '7-1-stable' +gem 'rails', '7.1.2' gem 'bootsnap', require: false gem 'pg', '~> 1.4.6' diff --git a/Gemfile.lock b/Gemfile.lock index 0b2162cbe..7980b718d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,37 +1,36 @@ -GIT - remote: https://github.com/rails/rails.git - revision: 28deb8bb7a6071573e43a463e766ac6eeeb82601 - branch: 7-1-stable +GEM + remote: https://rubygems.org/ specs: - actioncable (7.1.1) - actionpack (= 7.1.1) - activesupport (= 7.1.1) + Ascii85 (1.1.0) + actioncable (7.1.2) + actionpack (= 7.1.2) + activesupport (= 7.1.2) nio4r (~> 2.0) websocket-driver (>= 0.6.1) zeitwerk (~> 2.6) - actionmailbox (7.1.1) - actionpack (= 7.1.1) - activejob (= 7.1.1) - activerecord (= 7.1.1) - activestorage (= 7.1.1) - activesupport (= 7.1.1) + actionmailbox (7.1.2) + actionpack (= 7.1.2) + activejob (= 7.1.2) + activerecord (= 7.1.2) + activestorage (= 7.1.2) + activesupport (= 7.1.2) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.1.1) - actionpack (= 7.1.1) - actionview (= 7.1.1) - activejob (= 7.1.1) - activesupport (= 7.1.1) + actionmailer (7.1.2) + actionpack (= 7.1.2) + actionview (= 7.1.2) + activejob (= 7.1.2) + activesupport (= 7.1.2) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.2) - actionpack (7.1.1) - actionview (= 7.1.1) - activesupport (= 7.1.1) + actionpack (7.1.2) + actionview (= 7.1.2) + activesupport (= 7.1.2) nokogiri (>= 1.8.5) racc rack (>= 2.2.4) @@ -39,35 +38,44 @@ GIT rack-test (>= 0.6.3) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - actiontext (7.1.1) - actionpack (= 7.1.1) - activerecord (= 7.1.1) - activestorage (= 7.1.1) - activesupport (= 7.1.1) + actiontext (7.1.2) + actionpack (= 7.1.2) + activerecord (= 7.1.2) + activestorage (= 7.1.2) + activesupport (= 7.1.2) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.1.1) - activesupport (= 7.1.1) + actionview (7.1.2) + activesupport (= 7.1.2) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - activejob (7.1.1) - activesupport (= 7.1.1) + activeadmin (3.1.0) + arbre (~> 1.2, >= 1.2.1) + formtastic (>= 3.1) + formtastic_i18n (>= 0.4) + inherited_resources (~> 1.7) + jquery-rails (>= 4.2) + kaminari (>= 1.2.1) + railties (>= 6.1) + ransack (>= 4.0) + activejob (7.1.2) + activesupport (= 7.1.2) globalid (>= 0.3.6) - activemodel (7.1.1) - activesupport (= 7.1.1) - activerecord (7.1.1) - activemodel (= 7.1.1) - activesupport (= 7.1.1) + activemodel (7.1.2) + activesupport (= 7.1.2) + activerecord (7.1.2) + activemodel (= 7.1.2) + activesupport (= 7.1.2) timeout (>= 0.4.0) - activestorage (7.1.1) - actionpack (= 7.1.1) - activejob (= 7.1.1) - activerecord (= 7.1.1) - activesupport (= 7.1.1) + activestorage (7.1.2) + actionpack (= 7.1.2) + activejob (= 7.1.2) + activerecord (= 7.1.2) + activesupport (= 7.1.2) marcel (~> 1.0) - activesupport (7.1.1) + activesupport (7.1.2) base64 bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) @@ -77,42 +85,6 @@ GIT minitest (>= 5.1) mutex_m tzinfo (~> 2.0) - rails (7.1.1) - actioncable (= 7.1.1) - actionmailbox (= 7.1.1) - actionmailer (= 7.1.1) - actionpack (= 7.1.1) - actiontext (= 7.1.1) - actionview (= 7.1.1) - activejob (= 7.1.1) - activemodel (= 7.1.1) - activerecord (= 7.1.1) - activestorage (= 7.1.1) - activesupport (= 7.1.1) - bundler (>= 1.15.0) - railties (= 7.1.1) - railties (7.1.1) - actionpack (= 7.1.1) - activesupport (= 7.1.1) - irb - rackup (>= 1.0.0) - rake (>= 12.2) - thor (~> 1.0, >= 1.2.2) - zeitwerk (~> 2.6) - -GEM - remote: https://rubygems.org/ - specs: - Ascii85 (1.1.0) - activeadmin (3.1.0) - arbre (~> 1.2, >= 1.2.1) - formtastic (>= 3.1) - formtastic_i18n (>= 0.4) - inherited_resources (~> 1.7) - jquery-rails (>= 4.2) - kaminari (>= 1.2.1) - railties (>= 6.1) - ransack (>= 4.0) acts_as_list (1.1.0) activerecord (>= 4.2) addressable (2.8.5) @@ -253,7 +225,7 @@ GEM activesupport (>= 3.0) nokogiri (>= 1.6) io-console (0.6.0) - irb (1.8.3) + irb (1.9.0) rdoc reline (>= 0.3.8) jmespath (1.6.2) @@ -380,6 +352,20 @@ GEM rackup (2.1.0) rack (>= 3) webrick (~> 1.8) + rails (7.1.2) + actioncable (= 7.1.2) + actionmailbox (= 7.1.2) + actionmailer (= 7.1.2) + actionpack (= 7.1.2) + actiontext (= 7.1.2) + actionview (= 7.1.2) + activejob (= 7.1.2) + activemodel (= 7.1.2) + activerecord (= 7.1.2) + activestorage (= 7.1.2) + activesupport (= 7.1.2) + bundler (>= 1.15.0) + railties (= 7.1.2) rails-dom-testing (2.2.0) activesupport (>= 5.0.0) minitest @@ -390,6 +376,14 @@ GEM rails-i18n (7.0.8) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 8) + railties (7.1.2) + actionpack (= 7.1.2) + activesupport (= 7.1.2) + irb + rackup (>= 1.0.0) + rake (>= 12.2) + thor (~> 1.0, >= 1.2.2) + zeitwerk (~> 2.6) rake (13.1.0) ransack (4.1.1) activerecord (>= 6.1.5) @@ -472,7 +466,7 @@ GEM simple_form (5.3.0) actionpack (>= 5.2) activemodel (>= 5.2) - slim (5.1.1) + slim (5.2.0) temple (~> 0.10.0) tilt (>= 2.1.0) sorbet-runtime (0.5.11120) @@ -518,7 +512,7 @@ GEM unaccent (0.4.0) unf (0.1.4) unf_ext - unf_ext (0.0.8.2) + unf_ext (0.0.9) unicode-display_width (2.5.0) uniform_notifier (1.16.0) web-console (4.2.1) @@ -588,7 +582,7 @@ DEPENDENCIES puma rack-cors rack-status - rails! + rails (= 7.1.2) rails-i18n redis rexml