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

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index cdc5c7e269503b8dff605afdf3db08c44bedf756..7bb5d705452c52e8fdbc0d062e6d7bef4ef1cce2 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 # Require rails
 source "https://rubygems.org"
 
 # Require rails

-gem "rails", "6.1.3.2"
+gem "rails", "6.1.4.4"

 
 # Require json for multi_json
 gem "json"
 
 # Require json for multi_json
 gem "json"


@@ -12,8 +12,8 @@ gem "pg"
 # Use SCSS for stylesheets
 gem "sassc-rails"
 
 # Use SCSS for stylesheets
 gem "sassc-rails"
 

-# Use Uglifier as compressor for JavaScript assets
-gem "uglifier", ">= 1.3.0"
+# Use Terser as compressor for JavaScript assets
+gem "terser"

 
 # Use jquery as the JavaScript library
 gem "jquery-rails"
 
 # Use jquery as the JavaScript library
 gem "jquery-rails"


@@ -33,6 +33,9 @@ gem "autoprefixer-rails"
 # Use image_optim to optimise images
 gem "image_optim_rails"
 
 # Use image_optim to optimise images
 gem "image_optim_rails"
 

+# Use argon2 for password hashing
+gem "argon2"
+

 # Load rails plugins
 gem "actionpack-page_caching", ">= 1.2.0"
 gem "activerecord-import"
 # Load rails plugins
 gem "actionpack-page_caching", ">= 1.2.0"
 gem "activerecord-import"


@@ -96,6 +99,7 @@ gem "maxminddb"
 gem "rotp"
 
 # Load memcache client in case we are using it
 gem "rotp"
 
 # Load memcache client in case we are using it

+gem "connection_pool"

 gem "dalli"
 gem "kgio"
 
 gem "dalli"
 gem "kgio"
 


@@ -147,7 +151,7 @@ group :test do
   gem "rubocop-performance"
   gem "rubocop-rails"
   gem "rubocop-rake"
   gem "rubocop-performance"
   gem "rubocop-rails"
   gem "rubocop-rake"

-  gem "selenium-webdriver"
+  gem "selenium-webdriver", "~> 3.142.7"

   gem "simplecov", :require => false
   gem "simplecov-lcov", :require => false
   gem "webmock"
   gem "simplecov", :require => false
   gem "simplecov-lcov", :require => false
   gem "webmock"