From 5fc99b9946808a592c2737297ff948f0995e9d43 Mon Sep 17 00:00:00 2001 From: evazion Date: Fri, 18 Dec 2020 02:04:43 -0600 Subject: [PATCH] Upgrade to Rails 6.1. * Swap out activerecord-hierarchical_query gem for some guy's patched version because the mainline version is incompatible with 6.1. * Disable meta_request gem because it hangs puma on startup on 6.1. --- Gemfile | 4 +- Gemfile.lock | 151 ++++++++++++++++++++++++++------------------------- 2 files changed, 79 insertions(+), 76 deletions(-) diff --git a/Gemfile b/Gemfile index 92332c2e6..eed0df543 100644 --- a/Gemfile +++ b/Gemfile @@ -40,7 +40,7 @@ gem 'puma' gem 'scenic' gem 'ipaddress_2' gem 'http' -gem 'activerecord-hierarchical_query' +gem 'activerecord-hierarchical_query', git: "https://github.com/walski/activerecord-hierarchical_query", branch: "rails-6-1" gem 'http-cookie', git: "https://github.com/danbooru/http-cookie" gem 'pundit' gem 'mail' @@ -60,7 +60,7 @@ end group :development do gem 'rubocop' gem 'rubocop-rails' - gem 'meta_request' + # gem 'meta_request' # hangs on Rails 6.1 gem 'rack-mini-profiler' gem 'stackprof' gem 'flamegraph' diff --git a/Gemfile.lock b/Gemfile.lock index 2fb7f8a00..021635222 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -12,71 +12,81 @@ GIT dtext_rb (1.10.6) nokogiri (~> 1.8) +GIT + remote: https://github.com/walski/activerecord-hierarchical_query + revision: 3d6663307ed2f6a23347084c04700a26c7e7bb55 + branch: rails-6-1 + specs: + activerecord-hierarchical_query (1.2.3) + activerecord (>= 5.0, < 6.2) + pg (>= 0.21, < 1.3) + GEM remote: https://rubygems.org/ specs: - actioncable (6.0.3.4) - actionpack (= 6.0.3.4) + actioncable (6.1.0) + actionpack (= 6.1.0) + activesupport (= 6.1.0) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.0.3.4) - actionpack (= 6.0.3.4) - activejob (= 6.0.3.4) - activerecord (= 6.0.3.4) - activestorage (= 6.0.3.4) - activesupport (= 6.0.3.4) + actionmailbox (6.1.0) + actionpack (= 6.1.0) + activejob (= 6.1.0) + activerecord (= 6.1.0) + activestorage (= 6.1.0) + activesupport (= 6.1.0) mail (>= 2.7.1) - actionmailer (6.0.3.4) - actionpack (= 6.0.3.4) - actionview (= 6.0.3.4) - activejob (= 6.0.3.4) + actionmailer (6.1.0) + actionpack (= 6.1.0) + actionview (= 6.1.0) + activejob (= 6.1.0) + activesupport (= 6.1.0) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.0.3.4) - actionview (= 6.0.3.4) - activesupport (= 6.0.3.4) - rack (~> 2.0, >= 2.0.8) + actionpack (6.1.0) + actionview (= 6.1.0) + activesupport (= 6.1.0) + rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.0.3.4) - actionpack (= 6.0.3.4) - activerecord (= 6.0.3.4) - activestorage (= 6.0.3.4) - activesupport (= 6.0.3.4) + actiontext (6.1.0) + actionpack (= 6.1.0) + activerecord (= 6.1.0) + activestorage (= 6.1.0) + activesupport (= 6.1.0) nokogiri (>= 1.8.5) - actionview (6.0.3.4) - activesupport (= 6.0.3.4) + actionview (6.1.0) + activesupport (= 6.1.0) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.0.3.4) - activesupport (= 6.0.3.4) + activejob (6.1.0) + activesupport (= 6.1.0) globalid (>= 0.3.6) - activemodel (6.0.3.4) - activesupport (= 6.0.3.4) + activemodel (6.1.0) + activesupport (= 6.1.0) activemodel-serializers-xml (1.0.2) activemodel (> 5.x) activesupport (> 5.x) builder (~> 3.1) - activerecord (6.0.3.4) - activemodel (= 6.0.3.4) - activesupport (= 6.0.3.4) - activerecord-hierarchical_query (1.2.3) - activerecord (>= 5.0, < 6.1) - pg (>= 0.21, < 1.3) - activestorage (6.0.3.4) - actionpack (= 6.0.3.4) - activejob (= 6.0.3.4) - activerecord (= 6.0.3.4) + activerecord (6.1.0) + activemodel (= 6.1.0) + activesupport (= 6.1.0) + activestorage (6.1.0) + actionpack (= 6.1.0) + activejob (= 6.1.0) + activerecord (= 6.1.0) + activesupport (= 6.1.0) marcel (~> 0.3.1) - activesupport (6.0.3.4) + mimemagic (~> 0.3.2) + activesupport (6.1.0) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - zeitwerk (~> 2.2, >= 2.2.2) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) airbrussh (1.4.0) @@ -84,13 +94,13 @@ GEM ansi (1.5.0) ast (2.4.1) aws-eventstream (1.1.0) - aws-partitions (1.405.0) + aws-partitions (1.409.0) aws-sdk-core (3.110.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-sqs (1.34.0) + aws-sdk-sqs (1.35.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) aws-sigv4 (1.2.2) @@ -176,7 +186,7 @@ GEM concurrent-ruby (~> 1.0) ipaddress_2 (0.13.0) jmespath (1.4.0) - json (2.3.1) + json (2.4.1) jwt (2.2.2) kgio (2.11.3) listen (3.3.3) @@ -191,9 +201,6 @@ GEM mimemagic (~> 0.3.2) memoist (0.16.2) memory_profiler (1.0.0) - meta_request (0.7.2) - rack-contrib (>= 1.1, < 3) - railties (>= 3.0.0, < 7) method_source (1.0.0) mimemagic (0.3.5) mini_mime (1.0.2) @@ -247,40 +254,38 @@ GEM pundit (2.1.0) activesupport (>= 3.0.0) rack (2.2.3) - rack-contrib (2.3.0) - rack (~> 2.0) rack-mini-profiler (2.2.0) rack (>= 1.2.0) rack-proxy (0.6.5) rack rack-test (1.1.0) rack (>= 1.0, < 3) - rails (6.0.3.4) - actioncable (= 6.0.3.4) - actionmailbox (= 6.0.3.4) - actionmailer (= 6.0.3.4) - actionpack (= 6.0.3.4) - actiontext (= 6.0.3.4) - actionview (= 6.0.3.4) - activejob (= 6.0.3.4) - activemodel (= 6.0.3.4) - activerecord (= 6.0.3.4) - activestorage (= 6.0.3.4) - activesupport (= 6.0.3.4) - bundler (>= 1.3.0) - railties (= 6.0.3.4) + rails (6.1.0) + actioncable (= 6.1.0) + actionmailbox (= 6.1.0) + actionmailer (= 6.1.0) + actionpack (= 6.1.0) + actiontext (= 6.1.0) + actionview (= 6.1.0) + activejob (= 6.1.0) + activemodel (= 6.1.0) + activerecord (= 6.1.0) + activestorage (= 6.1.0) + activesupport (= 6.1.0) + bundler (>= 1.15.0) + railties (= 6.1.0) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) rails-html-sanitizer (1.3.0) loofah (~> 2.3) - railties (6.0.3.4) - actionpack (= 6.0.3.4) - activesupport (= 6.0.3.4) + railties (6.1.0) + actionpack (= 6.1.0) + activesupport (= 6.1.0) method_source rake (>= 0.8.7) - thor (>= 0.20.3, < 2.0) + thor (~> 1.0) rainbow (3.0.0) raindrops (0.19.1) rake (13.0.1) @@ -309,7 +314,7 @@ GEM unicode-display_width (>= 1.4.0, < 2.0) rubocop-ast (1.3.0) parser (>= 2.7.1.5) - rubocop-rails (2.9.0) + rubocop-rails (2.9.1) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 0.90.0, < 2.0) @@ -360,9 +365,8 @@ GEM multi_json (~> 1.0) stripe (> 5, < 6) thor (1.0.1) - thread_safe (0.3.6) - tzinfo (1.2.8) - thread_safe (~> 0.1) + tzinfo (2.0.4) + concurrent-ruby (~> 1.0) unf (0.1.4) unf_ext unf_ext (0.0.7.7) @@ -392,7 +396,7 @@ PLATFORMS DEPENDENCIES activemodel-serializers-xml - activerecord-hierarchical_query + activerecord-hierarchical_query! addressable aws-sdk-sqs (~> 1) bcrypt @@ -421,7 +425,6 @@ DEPENDENCIES mail memoist memory_profiler - meta_request minitest-ci minitest-reporters mocha