Merge remote-tracking branch 'upstream/pull/3445'

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index c4d6114303e5bd71b4f98bd64f8ddba8d4026591..7bb5d705452c52e8fdbc0d062e6d7bef4ef1cce2 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 # Require rails
-gem "rails", "6.1.4.1"
+gem "rails", "6.1.4.4"
 
 # Require json for multi_json
 gem "json"
@@ -24,9 +24,6 @@ gem "jbuilder", "~> 2.7"
 # Reduces boot times through caching; required in config/boot.rb
 gem "bootsnap", ">= 1.4.2", :require => false
 
-# Block upgrades to sprockets-rails 3.4.0
-gem "sprockets-rails", "< 3.4.0"
-
 # Use R2 for RTL conversion
 gem "r2", "~> 0.2.7"
 
@@ -46,7 +43,7 @@ gem "active_record_union"
 gem "bootstrap", "~> 4.5.0"
 gem "bootstrap_form", "~> 4.0"
 gem "cancancan"
-gem "composite_primary_keys", "~> 13.0.0", "!= 13.0.1"
+gem "composite_primary_keys", "~> 13.0.0"
 gem "config"
 gem "delayed_job_active_record"
 gem "http_accept_language", "~> 2.1.1"