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

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index f79e13a8f8ae87b422fa4fb9e8283b1d7b720a0c..34bb226b9907431d9a440df05e479a8d65b5dfe3 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 # Require rails
-gem "rails", "6.0.2.2"
+gem "rails", "6.0.3.2"
 
 # Require things which have moved to gems in ruby 1.9
 gem "bigdecimal", "~> 1.1.0", :platforms => :ruby_19
@@ -49,7 +49,7 @@ gem "composite_primary_keys", "~> 12.0.0"
 gem "config"
 gem "delayed_job_active_record"
 gem "dynamic_form"
-gem "http_accept_language", "~> 2.0.0"
+gem "http_accept_language", "~> 2.1.1"
 gem "i18n-js", ">= 3.0.0"
 gem "oauth-plugin", ">= 0.5.1"
 gem "openstreetmap-deadlock_retry", ">= 1.3.0", :require => "deadlock_retry"
@@ -143,7 +143,6 @@ group :test do
   gem "erb_lint", :require => false
   gem "factory_bot_rails"
   gem "minitest", "~> 5.1"
-  gem "poltergeist"
   gem "puma", "~> 3.11"
   gem "rails-controller-testing"
   gem "rubocop"