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

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 8b606ddd508ef76cd909ea823af09d08a5cf5701..1cd0edca7373f46657cef56c9385087cfe1ca485 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -43,18 +43,18 @@ gem "image_optim_rails"
 gem "actionpack-page_caching", ">= 1.2.0"
 gem "active_record_union"
 gem "activerecord-import"
-gem "bootstrap", "~> 4.3.1"
+gem "bootstrap", "~> 4.5.0"
 gem "cancancan"
 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"
 gem "rack-cors"
-gem "rails-i18n", "~> 4.0.0"
+gem "rails-i18n", "~> 6.0.0"
 gem "rinku", ">= 2.0.6", :require => "rails_rinku"
 gem "strong_migrations"
 gem "validates_email_format_of", ">= 1.5.1"