From f9ef8a2008261584cd296ab0b4e9865a0ffdd01d Mon Sep 17 00:00:00 2001 From: Jill Dimond Date: Tue, 28 Nov 2023 13:52:09 -0500 Subject: [PATCH] Update to rails 7 --- Gemfile | 6 +- Gemfile.lock | 208 ++++++++++++++++++++++++++------------------------- 2 files changed, 110 insertions(+), 104 deletions(-) diff --git a/Gemfile b/Gemfile index 93e0d87222..6b5b6ed8cb 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source "http://rubygems.org" -gem "rails", "~> 6.1.1" +gem "rails", "~> 7.0" # Misc gem "attribute_normalizer", "~> 1.2" @@ -106,7 +106,7 @@ gem "whenever", "~> 1.0", require: false gem "i18n-country-translations", "~> 1.0" gem "i18n-js", "~> 3.0" gem "iso-639", "~> 0.3.5" -gem "rails-i18n", "~> 6.0" +gem "rails-i18n", "~> 7.0" # Analytics gem "scout_apm", "~> 5.0" @@ -130,7 +130,7 @@ group :development do gem "rails-erd", "~> 1.6" # N+1 detection. Config is in environments/development.rb - gem "bullet", "~> 6.1" + gem "bullet", "~> 7.1" # Great for debugging i18n paths (uncomment temporarily when needed). # gem "i18n-debug", "~> 1.1" diff --git a/Gemfile.lock b/Gemfile.lock index 2d39509fe4..493fc965df 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -28,42 +28,49 @@ GIT GEM remote: http://rubygems.org/ specs: - actioncable (6.1.7.6) - actionpack (= 6.1.7.6) - activesupport (= 6.1.7.6) + actioncable (7.0.8) + actionpack (= 7.0.8) + activesupport (= 7.0.8) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.1.7.6) - actionpack (= 6.1.7.6) - activejob (= 6.1.7.6) - activerecord (= 6.1.7.6) - activestorage (= 6.1.7.6) - activesupport (= 6.1.7.6) + actionmailbox (7.0.8) + actionpack (= 7.0.8) + activejob (= 7.0.8) + activerecord (= 7.0.8) + activestorage (= 7.0.8) + activesupport (= 7.0.8) mail (>= 2.7.1) - actionmailer (6.1.7.6) - actionpack (= 6.1.7.6) - actionview (= 6.1.7.6) - activejob (= 6.1.7.6) - activesupport (= 6.1.7.6) + net-imap + net-pop + net-smtp + actionmailer (7.0.8) + actionpack (= 7.0.8) + actionview (= 7.0.8) + activejob (= 7.0.8) + activesupport (= 7.0.8) mail (~> 2.5, >= 2.5.4) + net-imap + net-pop + net-smtp rails-dom-testing (~> 2.0) - actionpack (6.1.7.6) - actionview (= 6.1.7.6) - activesupport (= 6.1.7.6) - rack (~> 2.0, >= 2.0.9) + actionpack (7.0.8) + actionview (= 7.0.8) + activesupport (= 7.0.8) + rack (~> 2.0, >= 2.2.4) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) actionpack-page_caching (1.2.4) actionpack (>= 4.0.0) - actiontext (6.1.7.6) - actionpack (= 6.1.7.6) - activerecord (= 6.1.7.6) - activestorage (= 6.1.7.6) - activesupport (= 6.1.7.6) + actiontext (7.0.8) + actionpack (= 7.0.8) + activerecord (= 7.0.8) + activestorage (= 7.0.8) + activesupport (= 7.0.8) + globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (6.1.7.6) - activesupport (= 6.1.7.6) + actionview (7.0.8) + activesupport (= 7.0.8) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) @@ -73,31 +80,30 @@ GEM activemodel (>= 5.2.0) activestorage (>= 5.2.0) activesupport (>= 5.2.0) - activejob (6.1.7.6) - activesupport (= 6.1.7.6) + activejob (7.0.8) + activesupport (= 7.0.8) globalid (>= 0.3.6) - activemodel (6.1.7.6) - activesupport (= 6.1.7.6) + activemodel (7.0.8) + activesupport (= 7.0.8) activemodel-serializers-xml (1.0.2) activemodel (> 5.x) activesupport (> 5.x) builder (~> 3.1) - activerecord (6.1.7.6) - activemodel (= 6.1.7.6) - activesupport (= 6.1.7.6) - activestorage (6.1.7.6) - actionpack (= 6.1.7.6) - activejob (= 6.1.7.6) - activerecord (= 6.1.7.6) - activesupport (= 6.1.7.6) + activerecord (7.0.8) + activemodel (= 7.0.8) + activesupport (= 7.0.8) + activestorage (7.0.8) + actionpack (= 7.0.8) + activejob (= 7.0.8) + activerecord (= 7.0.8) + activesupport (= 7.0.8) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (6.1.7.6) + activesupport (7.0.8) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - zeitwerk (~> 2.3) acts_as_list (1.1.0) activerecord (>= 4.2) addressable (2.8.5) @@ -117,24 +123,24 @@ GEM activerecord (>= 5.2, < 7.1) activesupport (>= 5.2, < 7.1) request_store (~> 1.0) - autoprefixer-rails (10.4.13.0) + autoprefixer-rails (10.4.15.0) execjs (~> 2) awesome_print (1.9.2) aws-eventstream (1.2.0) - aws-partitions (1.802.0) - aws-sdk-core (3.180.3) + aws-partitions (1.841.0) + aws-sdk-core (3.185.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.5) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.71.0) - aws-sdk-core (~> 3, >= 3.177.0) + aws-sdk-kms (1.72.0) + aws-sdk-core (~> 3, >= 3.184.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.132.1) - aws-sdk-core (~> 3, >= 3.179.0) + aws-sdk-s3 (1.136.0) + aws-sdk-core (~> 3, >= 3.181.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.6) - aws-sigv4 (1.6.0) + aws-sigv4 (1.6.1) aws-eventstream (~> 1, >= 1.0.2) azure-storage-blob (2.0.3) azure-storage-common (~> 2.0) @@ -159,7 +165,7 @@ GEM popper_js (>= 1.16.1, < 2) sassc-rails (>= 2.0.0) builder (3.2.4) - bullet (6.1.5) + bullet (7.1.2) activesupport (>= 3.0.0) uniform_notifier (~> 1.11) byebug (11.1.3) @@ -195,7 +201,7 @@ GEM rexml crass (1.0.6) daemons (1.4.1) - dalli (3.2.5) + dalli (3.2.6) database_cleaner (1.99.0) date (3.3.3) db-query-matchers (0.11.0) @@ -204,7 +210,7 @@ GEM debug_inspector (1.1.0) delayed_job (4.1.11) activesupport (>= 3.0, < 8.0) - delayed_job_active_record (4.1.7) + delayed_job_active_record (4.1.8) activerecord (>= 3.0, < 8.0) delayed_job (>= 3.0, < 5) descriptive_statistics (2.5.1) @@ -231,7 +237,7 @@ GEM exception_notification (4.5.0) actionmailer (>= 5.2, < 8) activesupport (>= 5.2, < 8) - execjs (2.8.1) + execjs (2.9.1) factory_bot (4.11.1) activesupport (>= 3.0.0) factory_bot_rails (4.11.1) @@ -264,7 +270,7 @@ GEM faraday-retry (1.0.3) faraday_middleware (1.2.0) faraday (~> 1.0) - ffi (1.15.5) + ffi (1.16.3) ffi-compiler (1.0.1) ffi (>= 1.0.0) rake @@ -275,8 +281,8 @@ GEM railties (>= 3.2, < 8.0) friendly_id (5.5.0) activerecord (>= 4.0.0) - globalid (1.1.0) - activesupport (>= 5.0) + globalid (1.2.1) + activesupport (>= 6.1) hairtrigger (0.2.25) activerecord (>= 5.0, < 8) ruby2ruby (~> 2.4) @@ -322,7 +328,7 @@ GEM listen (3.8.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - loofah (2.21.3) + loofah (2.21.4) crass (~> 1.0.2) nokogiri (>= 1.12.0) mail (2.8.1) @@ -333,27 +339,27 @@ GEM marcel (1.0.2) matrix (0.4.2) method_source (1.0.0) - mime-types (3.5.0) + mime-types (3.5.1) mime-types-data (~> 3.2015) - mime-types-data (3.2023.0808) + mime-types-data (3.2023.1003) mini_magick (4.12.0) mini_mime (1.1.5) - mini_portile2 (2.8.4) - minitest (5.19.0) + mini_portile2 (2.8.5) + minitest (5.20.0) mocha (1.16.1) msgpack (1.7.2) multi_json (1.15.0) multipart-post (2.3.0) net-http-persistent (4.0.2) connection_pool (~> 2.2) - net-imap (0.3.7) + net-imap (0.4.2) date net-protocol net-pop (0.1.2) net-protocol net-protocol (0.2.1) timeout - net-smtp (0.3.3) + net-smtp (0.4.0) net-protocol netrc (0.11.0) nio4r (2.5.9) @@ -361,7 +367,7 @@ GEM mini_portile2 (~> 2.8.2) racc (~> 1.4) parallel (1.23.0) - parser (3.2.2.3) + parser (3.2.2.4) ast (~> 2.4.1) racc pg (1.4.6) @@ -369,7 +375,7 @@ GEM activerecord (>= 5.2) activesupport (>= 5.2) phantomjs (2.1.1.0) - phony (2.20.6) + phony (2.20.9) popper_js (1.16.1) postgres-copy (1.7.1) activerecord (>= 5.1) @@ -389,25 +395,24 @@ GEM rack (2.2.8) rack-attack (6.7.0) rack (>= 1.0, < 4) - rack-proxy (0.7.6) + rack-proxy (0.7.7) rack rack-test (2.1.0) rack (>= 1.3) - rails (6.1.7.6) - actioncable (= 6.1.7.6) - actionmailbox (= 6.1.7.6) - actionmailer (= 6.1.7.6) - actionpack (= 6.1.7.6) - actiontext (= 6.1.7.6) - actionview (= 6.1.7.6) - activejob (= 6.1.7.6) - activemodel (= 6.1.7.6) - activerecord (= 6.1.7.6) - activestorage (= 6.1.7.6) - activesupport (= 6.1.7.6) + rails (7.0.8) + actioncable (= 7.0.8) + actionmailbox (= 7.0.8) + actionmailer (= 7.0.8) + actionpack (= 7.0.8) + actiontext (= 7.0.8) + actionview (= 7.0.8) + activejob (= 7.0.8) + activemodel (= 7.0.8) + activerecord (= 7.0.8) + activestorage (= 7.0.8) + activesupport (= 7.0.8) bundler (>= 1.15.0) - railties (= 6.1.7.6) - sprockets-rails (>= 2.0.0) + railties (= 7.0.8) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -424,15 +429,16 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - rails-i18n (6.0.0) + rails-i18n (7.0.8) i18n (>= 0.7, < 2) - railties (>= 6.0.0, < 7) - railties (6.1.7.6) - actionpack (= 6.1.7.6) - activesupport (= 6.1.7.6) + railties (>= 6.0.0, < 8) + railties (7.0.8) + actionpack (= 7.0.8) + activesupport (= 7.0.8) method_source rake (>= 12.2) thor (~> 1.0) + zeitwerk (~> 2.5) rainbow (3.1.1) rake (13.0.6) random_data (1.6.0) @@ -448,10 +454,10 @@ GEM tilt recaptcha (3.4.0) json - regexp_parser (2.8.1) + regexp_parser (2.8.2) request_store (1.5.1) rack (>= 1.4) - responders (3.1.0) + responders (3.1.1) actionpack (>= 5.2) railties (>= 5.2) rest-client (2.1.0) @@ -470,7 +476,7 @@ GEM rspec-core (~> 3.9.0) rspec-expectations (~> 3.9.0) rspec-mocks (~> 3.9.0) - rspec-collection_matchers (1.2.0) + rspec-collection_matchers (1.2.1) rspec-expectations (>= 2.99.0.beta1) rspec-core (3.9.3) rspec-support (~> 3.9.3) @@ -517,7 +523,7 @@ GEM nokogiri rest-client ruby-progressbar (1.13.0) - ruby-vips (2.1.4) + ruby-vips (2.2.0) ffi (~> 1.12) ruby2_keywords (0.0.5) ruby2ruby (2.5.0) @@ -539,15 +545,15 @@ GEM scrypt (3.0.7) ffi-compiler (>= 1.0, < 2.0) select2-rails (4.0.13) - selenium-webdriver (4.11.0) + selenium-webdriver (4.14.0) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) semantic_range (3.0.0) - sentry-rails (5.10.0) + sentry-rails (5.12.0) railties (>= 5.0) - sentry-ruby (~> 5.10.0) - sentry-ruby (5.10.0) + sentry-ruby (~> 5.12.0) + sentry-ruby (5.12.0) concurrent-ruby (~> 1.0, >= 1.0.2) sexp_processor (4.17.0) spinjs-rails (1.3) @@ -560,15 +566,15 @@ GEM activesupport (>= 5.2) sprockets (>= 3.0.0) sync (0.5.0) - sys-filesystem (1.4.3) + sys-filesystem (1.4.4) ffi (~> 1.1) term-ansicolor (1.7.1) tins (~> 1.0) terrapin (0.6.0) climate_control (>= 0.0.3, < 1.0) - thor (1.2.2) - tilt (2.2.0) - timecop (0.9.6) + thor (1.3.0) + tilt (2.3.0) + timecop (0.9.8) timeout (0.4.0) tins (1.32.1) sync @@ -591,7 +597,7 @@ GEM railties (>= 3) yard (~> 0.9.20) warning (1.3.0) - webmock (3.18.1) + webmock (3.19.1) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) @@ -600,7 +606,7 @@ GEM rack-proxy (>= 0.6.1) railties (>= 5.2) semantic_range (>= 2.3.0) - websocket (1.2.9) + websocket (1.2.10) websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) @@ -618,7 +624,7 @@ GEM xpath (3.2.0) nokogiri (~> 1.8) yard (0.9.34) - zeitwerk (2.6.11) + zeitwerk (2.6.12) PLATFORMS ruby @@ -641,7 +647,7 @@ DEPENDENCIES blueprinter (~> 0.25.1) bootsnap (~> 1.4) bootstrap (~> 4.3) - bullet (~> 6.1) + bullet (~> 7.1) cancancan (~> 3.1) capybara (~> 3.30) capybara-screenshot (~> 1.0) @@ -690,11 +696,11 @@ DEPENDENCIES pry-rails (~> 0.3) puma (~> 5.6) rack-attack (~> 6.3) - rails (~> 6.1.1) + rails (~> 7.0) rails-backbone! rails-controller-testing (~> 1.0) rails-erd (~> 1.6) - rails-i18n (~> 6.0) + rails-i18n (~> 7.0) rake (~> 13.0) random_data (~> 1.6) rdiscount (~> 2.1)