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

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 34bb226b9907431d9a440df05e479a8d65b5dfe3..1cd0edca7373f46657cef56c9385087cfe1ca485 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -43,7 +43,7 @@ gem "image_optim_rails"
 gem "actionpack-page_caching", ">= 1.2.0"
 gem "active_record_union"
 gem "activerecord-import"
 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 "cancancan"
 gem "composite_primary_keys", "~> 12.0.0"
 gem "config"


@@ -54,7 +54,7 @@ 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 "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"
 gem "rinku", ">= 2.0.6", :require => "rails_rinku"
 gem "strong_migrations"
 gem "validates_email_format_of", ">= 1.5.1"


@@ -143,7 +143,7 @@ group :test do
   gem "erb_lint", :require => false
   gem "factory_bot_rails"
   gem "minitest", "~> 5.1"
   gem "erb_lint", :require => false
   gem "factory_bot_rails"
   gem "minitest", "~> 5.1"

-  gem "puma", "~> 3.11"
+  gem "puma", "~> 4.3"

   gem "rails-controller-testing"
   gem "rubocop"
   gem "rubocop-minitest"
   gem "rails-controller-testing"
   gem "rubocop"
   gem "rubocop-minitest"