Use factory_bot to build new model objects

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 17f6cc7918088f087c7e4121241785e1db2a0720..7ee75cb664d401ae834e7b99965877e1fba99eed 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.4.1"
+gem "rails", "6.1.4.4"

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


@@ -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"


@@ -40,7 +43,7 @@ gem "active_record_union"
 gem "bootstrap", "~> 4.5.0"
 gem "bootstrap_form", "~> 4.0"
 gem "cancancan"
 gem "bootstrap", "~> 4.5.0"
 gem "bootstrap_form", "~> 4.0"
 gem "cancancan"

-gem "composite_primary_keys", "~> 13.0.0"
+gem "composite_primary_keys", "~> 13.0.0", "!= 13.0.1"

 gem "config"
 gem "delayed_job_active_record"
 gem "http_accept_language", "~> 2.1.1"
 gem "config"
 gem "delayed_job_active_record"
 gem "http_accept_language", "~> 2.1.1"


@@ -146,7 +149,7 @@ group :test do
   gem "rubocop"
   gem "rubocop-minitest"
   gem "rubocop-performance"
   gem "rubocop"
   gem "rubocop-minitest"
   gem "rubocop-performance"

-  gem "rubocop-rails", "~> 2.11.3" # Bug in 2.12.0, fixed in master after 2.12.2
+  gem "rubocop-rails"

   gem "rubocop-rake"
   gem "selenium-webdriver", "~> 3.142.7"
   gem "simplecov", :require => false
   gem "rubocop-rake"
   gem "selenium-webdriver", "~> 3.142.7"
   gem "simplecov", :require => false