Merge remote-tracking branch 'upstream/pull/2954' into master

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index c16d36497ee2ebb6740b50f3ff5082ddec4a0c95..6f0a20c7aa9b40f88895c2fb205847b89c32ed17 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 # Require rails
-gem "rails", "6.0.3.2"
+gem "rails", "6.0.3.4"
 
 # Require things which have moved to gems in ruby 1.9
 gem "bigdecimal", "~> 1.1.0", :platforms => :ruby_19
@@ -41,9 +41,10 @@ gem "image_optim_rails"
 
 # Load rails plugins
 gem "actionpack-page_caching", ">= 1.2.0"
-gem "active_record_union"
 gem "activerecord-import"
-gem "bootstrap", "~> 4.3.1"
+gem "active_record_union"
+gem "bootstrap", "~> 4.5.0"
+gem "bootstrap_form", "~> 4.0"
 gem "cancancan"
 gem "composite_primary_keys", "~> 12.0.0"
 gem "config"
@@ -138,12 +139,13 @@ end
 
 # Gems needed for running tests
 group :test do
+  gem "brakeman"
   gem "capybara", ">= 2.15"
   gem "coveralls", :require => false
   gem "erb_lint", :require => false
   gem "factory_bot_rails"
   gem "minitest", "~> 5.1"
-  gem "puma", "~> 3.11"
+  gem "puma", "~> 5.0"
   gem "rails-controller-testing"
   gem "rubocop"
   gem "rubocop-minitest"