From c6855261fe4a6ee723f5a78af4517aaff3af1ee3 Mon Sep 17 00:00:00 2001 From: evazion Date: Wed, 23 Jun 2021 05:21:28 -0500 Subject: [PATCH] gems: update activerecord-hierarchical_query gem. The bug that blocked Rails 6.1 support was finally fixed upstream. --- Gemfile | 2 +- Gemfile.lock | 14 ++++---------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/Gemfile b/Gemfile index d0b11b29f..8f047d1e3 100644 --- a/Gemfile +++ b/Gemfile @@ -39,7 +39,7 @@ gem 'puma' gem 'scenic' gem 'ipaddress_2' gem 'http', "~> 4.4.1" -gem 'activerecord-hierarchical_query', git: "https://github.com/walski/activerecord-hierarchical_query", branch: "rails-6-1" +gem '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 863100f6b..9d1cf1c90 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -12,15 +12,6 @@ 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: @@ -74,6 +65,9 @@ GEM activerecord (6.1.3.2) activemodel (= 6.1.3.2) activesupport (= 6.1.3.2) + activerecord-hierarchical_query (1.3.0) + activerecord (>= 5.0, < 6.2) + pg (>= 0.21, < 1.3) activestorage (6.1.3.2) actionpack (= 6.1.3.2) activejob (= 6.1.3.2) @@ -512,7 +506,7 @@ PLATFORMS DEPENDENCIES activemodel-serializers-xml - activerecord-hierarchical_query! + activerecord-hierarchical_query addressable aws-sdk-sqs (~> 1) bcrypt