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

diff --combined Gemfile
index 7fbe56280076d9cf8f237769a7e1d0d1da916501,15348a9898a49b4572ab231f7625c479a93e0ba9..3df9bc7eb203df602ae36b62038ba2aea003fd35
--- 1/Gemfile
--- 2/Gemfile
+++ b/Gemfile
@@@ -33,6 -33,9 +33,9 @@@ gem "autoprefixer-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"
@@@ -146,7 -149,7 +149,7 @@@ group :test d
    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

diff --combined Gemfile.lock
index 6d9878656e8cd4d29857e48ca1e914635dc7a347,9c46a8653222f975802caa054f29951e63ab6c2a..7d510c09cdd6af89a6aec456ba0b6615ddf3d94d
--- 1/Gemfile.lock
--- 2/Gemfile.lock
+++ b/Gemfile.lock
@@@ -73,21 -73,24 +73,24 @@@ GE
      annotate (3.1.1)
        activerecord (>= 3.2, < 7.0)
        rake (>= 10.4, < 14.0)
+     argon2 (2.1.1)
+       ffi (~> 1.14)
+       ffi-compiler (~> 1.0)
      ast (2.4.2)
      autoprefixer-rails (10.3.3.0)
        execjs (~> 2)
      aws-eventstream (1.2.0)
 -    aws-partitions (1.522.0)
 -    aws-sdk-core (3.121.5)
 +    aws-partitions (1.525.0)
 +    aws-sdk-core (3.122.0)
        aws-eventstream (~> 1, >= 1.0.2)
 -      aws-partitions (~> 1, >= 1.520.1)
 +      aws-partitions (~> 1, >= 1.525.0)
        aws-sigv4 (~> 1.1)
        jmespath (~> 1.0)
 -    aws-sdk-kms (1.50.0)
 -      aws-sdk-core (~> 3, >= 3.121.2)
 +    aws-sdk-kms (1.51.0)
 +      aws-sdk-core (~> 3, >= 3.122.0)
        aws-sigv4 (~> 1.1)
 -    aws-sdk-s3 (1.104.0)
 -      aws-sdk-core (~> 3, >= 3.121.2)
 +    aws-sdk-s3 (1.105.1)
 +      aws-sdk-core (~> 3, >= 3.122.0)
        aws-sdk-kms (~> 1)
        aws-sigv4 (~> 1.4)
      aws-sigv4 (1.4.0)
@@@ -121,8 -124,8 +124,8 @@@
      bzip2-ffi (1.1.0)
        ffi (~> 1.0)
      cancancan (3.3.0)
 -    canonical-rails (0.2.12)
 -      rails (>= 4.1, < 6.2)
 +    canonical-rails (0.2.13)
 +      rails (>= 4.1, <= 7.0)
      capybara (3.36.0)
        addressable
        matrix
@@@ -225,6 -228,9 +228,9 @@@
      faraday-patron (1.0.0)
      faraday-rack (1.0.0)
      ffi (1.15.4)
+     ffi-compiler (1.0.1)
+       ffi (>= 1.0.0)
+       rake
      ffi-libarchive (1.1.3)
        ffi (~> 1.0)
      fspath (3.1.2)
@@@ -233,11 -239,11 +239,11 @@@
      globalid (0.5.2)
        activesupport (>= 5.0)
      hashdiff (1.0.1)
 -    hashie (4.1.0)
 +    hashie (5.0.0)
      html_tokenizer (0.0.7)
      htmlentities (4.3.4)
      http_accept_language (2.1.1)
 -    i18n (1.8.10)
 +    i18n (1.8.11)
        concurrent-ruby (~> 1.0)
      i18n-js (3.9.0)
        i18n (>= 0.6.6)
@@@ -328,7 -334,7 +334,7 @@@
      omniauth-oauth (1.2.0)
        oauth
        omniauth (>= 1.0, < 3)
 -    omniauth-oauth2 (1.7.1)
 +    omniauth-oauth2 (1.7.2)
        oauth2 (~> 1.4)
        omniauth (>= 1.9, < 3)
      omniauth-openid (2.0.1)
@@@ -417,14 -423,14 +423,14 @@@
        rubocop-ast (>= 1.12.0, < 2.0)
        ruby-progressbar (~> 1.7)
        unicode-display_width (>= 1.4.0, < 3.0)
 -    rubocop-ast (1.12.0)
 +    rubocop-ast (1.13.0)
        parser (>= 3.0.1.1)
      rubocop-minitest (0.15.2)
        rubocop (>= 0.90, < 2.0)
      rubocop-performance (1.12.0)
        rubocop (>= 1.7.0, < 2.0)
        rubocop-ast (>= 0.4.0)
 -    rubocop-rails (2.11.3)
 +    rubocop-rails (2.12.4)
        activesupport (>= 4.2.0)
        rack (>= 1.1)
        rubocop (>= 1.7.0, < 2.0)
@@@ -498,6 -504,7 +504,7 @@@ DEPENDENCIE
    active_record_union
    activerecord-import
    annotate
+   argon2
    autoprefixer-rails
    aws-sdk-s3
    better_errors
@@@ -564,7 -571,7 +571,7 @@@
    rubocop
    rubocop-minitest
    rubocop-performance
 -  rubocop-rails (~> 2.11.3)
 +  rubocop-rails
    rubocop-rake
    sanitize
    sassc-rails