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

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index c16d36497ee2ebb6740b50f3ff5082ddec4a0c95..540f616343d91a6eced60d9dc5e7d00dcae80571 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 "bootstrap", "~> 4.3.1"
+gem "bootstrap", "~> 4.5.0"
 gem "cancancan"
 gem "composite_primary_keys", "~> 12.0.0"
 gem "config"
@@ -138,12 +138,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", "~> 4.3"
   gem "rails-controller-testing"
   gem "rubocop"
   gem "rubocop-minitest"