From 3f25ad6dce5004a479c0c401aeaf9e7bd66efbc9 Mon Sep 17 00:00:00 2001 From: evazion Date: Wed, 5 Jan 2022 12:42:10 -0600 Subject: [PATCH] rails: upgrade to Rails 7.0.1. --- Gemfile | 4 +- Gemfile.lock | 173 +++++++++++++++++++++++++++++---------------------- 2 files changed, 100 insertions(+), 77 deletions(-) diff --git a/Gemfile b/Gemfile index af3bd0a2d..e1df61667 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org/' gem 'dotenv-rails', :require => "dotenv/rails-now" -gem "rails", "~> 6.0" +gem "rails", "~> 7.0" gem "pg" gem "simple_form" gem "sanitize" @@ -31,7 +31,7 @@ gem 'puma' gem 'scenic' gem 'ipaddress_2' gem 'http', "~> 4.4.1" -gem 'activerecord-hierarchical_query' +gem 'activerecord-hierarchical_query', git: "https://github.com/danbooru/activerecord-hierarchical_query" gem 'http-cookie', git: "https://github.com/danbooru/http-cookie" gem 'pundit' gem 'mail' diff --git a/Gemfile.lock b/Gemfile.lock index 000879c20..5e7b804ea 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,11 @@ +GIT + remote: https://github.com/danbooru/activerecord-hierarchical_query + revision: ffc83a7153ed2e22330993d2fd8eff8426d2cff3 + specs: + activerecord-hierarchical_query (1.3.0) + activerecord (>= 5.0, < 7.1) + pg (>= 0.21, < 1.3) + GIT remote: https://github.com/danbooru/dtext_rb.git revision: 954cd9aa52401108beed122fe93203b0beb8682a @@ -15,72 +23,75 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (6.1.4.4) - actionpack (= 6.1.4.4) - activesupport (= 6.1.4.4) + actioncable (7.0.1) + actionpack (= 7.0.1) + activesupport (= 7.0.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.1.4.4) - actionpack (= 6.1.4.4) - activejob (= 6.1.4.4) - activerecord (= 6.1.4.4) - activestorage (= 6.1.4.4) - activesupport (= 6.1.4.4) + actionmailbox (7.0.1) + actionpack (= 7.0.1) + activejob (= 7.0.1) + activerecord (= 7.0.1) + activestorage (= 7.0.1) + activesupport (= 7.0.1) mail (>= 2.7.1) - actionmailer (6.1.4.4) - actionpack (= 6.1.4.4) - actionview (= 6.1.4.4) - activejob (= 6.1.4.4) - activesupport (= 6.1.4.4) + net-imap + net-pop + net-smtp + actionmailer (7.0.1) + actionpack (= 7.0.1) + actionview (= 7.0.1) + activejob (= 7.0.1) + activesupport (= 7.0.1) mail (~> 2.5, >= 2.5.4) + net-imap + net-pop + net-smtp rails-dom-testing (~> 2.0) - actionpack (6.1.4.4) - actionview (= 6.1.4.4) - activesupport (= 6.1.4.4) - rack (~> 2.0, >= 2.0.9) + actionpack (7.0.1) + actionview (= 7.0.1) + activesupport (= 7.0.1) + rack (~> 2.0, >= 2.2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.1.4.4) - actionpack (= 6.1.4.4) - activerecord (= 6.1.4.4) - activestorage (= 6.1.4.4) - activesupport (= 6.1.4.4) + actiontext (7.0.1) + actionpack (= 7.0.1) + activerecord (= 7.0.1) + activestorage (= 7.0.1) + activesupport (= 7.0.1) + globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (6.1.4.4) - activesupport (= 6.1.4.4) + actionview (7.0.1) + activesupport (= 7.0.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.1.4.4) - activesupport (= 6.1.4.4) + activejob (7.0.1) + activesupport (= 7.0.1) globalid (>= 0.3.6) - activemodel (6.1.4.4) - activesupport (= 6.1.4.4) + activemodel (7.0.1) + activesupport (= 7.0.1) activemodel-serializers-xml (1.0.2) activemodel (> 5.x) activesupport (> 5.x) builder (~> 3.1) - activerecord (6.1.4.4) - activemodel (= 6.1.4.4) - activesupport (= 6.1.4.4) - activerecord-hierarchical_query (1.3.0) - activerecord (>= 5.0, < 6.2) - pg (>= 0.21, < 1.3) - activestorage (6.1.4.4) - actionpack (= 6.1.4.4) - activejob (= 6.1.4.4) - activerecord (= 6.1.4.4) - activesupport (= 6.1.4.4) - marcel (~> 1.0.0) + activerecord (7.0.1) + activemodel (= 7.0.1) + activesupport (= 7.0.1) + activestorage (7.0.1) + actionpack (= 7.0.1) + activejob (= 7.0.1) + activerecord (= 7.0.1) + activesupport (= 7.0.1) + marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (6.1.4.4) + activesupport (7.0.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - zeitwerk (~> 2.3) addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) ansi (1.5.0) @@ -148,6 +159,7 @@ GEM ruby-statistics (>= 2.1) thor (>= 0.19, < 2) diff-lcs (1.5.0) + digest (3.1.0) digest-crc (0.6.4) rake (>= 12.0.0, < 14.0.0) docile (1.4.0) @@ -261,6 +273,7 @@ GEM httpclient (2.8.3) i18n (1.8.11) concurrent-ruby (~> 1.0) + io-wait (0.2.1) ipaddress_2 (0.14.0) jaro_winkler (1.5.4) jmespath (1.4.0) @@ -285,7 +298,7 @@ GEM method_source (1.0.0) mini_histogram (0.3.1) mini_mime (1.1.2) - mini_portile2 (2.6.1) + mini_portile2 (2.7.1) minitest (5.15.0) minitest-ci (3.4.0) minitest (>= 5.0.6) @@ -301,10 +314,25 @@ GEM multi_json (1.15.0) multi_xml (0.6.0) multipart-post (2.1.1) + net-imap (0.2.3) + digest + net-protocol + strscan + net-pop (0.1.1) + digest + net-protocol + timeout + net-protocol (0.1.2) + io-wait + timeout + net-smtp (0.3.1) + digest + net-protocol + timeout newrelic_rpm (8.2.0) nio4r (2.5.8) - nokogiri (1.12.5) - mini_portile2 (~> 2.6.1) + nokogiri (1.13.0) + mini_portile2 (~> 2.7.0) racc (~> 1.4) oauth2 (1.4.7) faraday (>= 0.8, < 2.0) @@ -348,32 +376,32 @@ GEM rack-test (1.1.0) rack (>= 1.0, < 3) rack-timeout (0.6.0) - rails (6.1.4.4) - actioncable (= 6.1.4.4) - actionmailbox (= 6.1.4.4) - actionmailer (= 6.1.4.4) - actionpack (= 6.1.4.4) - actiontext (= 6.1.4.4) - actionview (= 6.1.4.4) - activejob (= 6.1.4.4) - activemodel (= 6.1.4.4) - activerecord (= 6.1.4.4) - activestorage (= 6.1.4.4) - activesupport (= 6.1.4.4) + rails (7.0.1) + actioncable (= 7.0.1) + actionmailbox (= 7.0.1) + actionmailer (= 7.0.1) + actionpack (= 7.0.1) + actiontext (= 7.0.1) + actionview (= 7.0.1) + activejob (= 7.0.1) + activemodel (= 7.0.1) + activerecord (= 7.0.1) + activestorage (= 7.0.1) + activesupport (= 7.0.1) bundler (>= 1.15.0) - railties (= 6.1.4.4) - sprockets-rails (>= 2.0.0) + railties (= 7.0.1) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) rails-html-sanitizer (1.4.2) loofah (~> 2.3) - railties (6.1.4.4) - actionpack (= 6.1.4.4) - activesupport (= 6.1.4.4) + railties (7.0.1) + actionpack (= 7.0.1) + activesupport (= 7.0.1) method_source - rake (>= 0.13) + rake (>= 12.2) thor (~> 1.0) + zeitwerk (~> 2.5) rainbow (3.0.0) rake (13.0.6) rakismet (1.5.4) @@ -463,23 +491,18 @@ GEM thor (~> 1.0) tilt (~> 2.0) yard (~> 0.9, >= 0.9.24) - sprockets (4.0.2) - concurrent-ruby (~> 1.0) - rack (> 1, < 3) - sprockets-rails (3.4.2) - actionpack (>= 5.2) - activesupport (>= 5.2) - sprockets (>= 3.0.0) stackprof (0.2.17) stripe (5.42.0) stripe-ruby-mock (3.0.1) dante (>= 0.2.0) multi_json (~> 1.0) stripe (> 5, < 6) + strscan (3.0.1) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) - thor (1.1.0) + thor (1.2.1) tilt (2.0.10) + timeout (0.2.0) trailblazer-option (0.1.2) tzinfo (2.0.4) concurrent-ruby (~> 1.0) @@ -506,14 +529,14 @@ GEM nokogiri (~> 1.8) yard (0.9.27) webrick (~> 1.7.0) - zeitwerk (2.5.2) + zeitwerk (2.5.3) PLATFORMS ruby DEPENDENCIES activemodel-serializers-xml - activerecord-hierarchical_query + activerecord-hierarchical_query! addressable aws-sdk-sqs (~> 1) bcrypt @@ -564,7 +587,7 @@ DEPENDENCIES pundit rack-mini-profiler rack-timeout - rails (~> 6.0) + rails (~> 7.0) rake rakismet rbtrace