Merge branch 'update-bcrypt' into 'master'

Update bcrypt to a version that builds on armhf

See merge request gitlab-org/gitlab!56008

Gemfile

@@ -25,8 +25,7 @@ gem 'marginalia', '~> 1.10.0'
 
 # Authentication libraries
 gem 'devise', '~> 4.7.2'
-# TODO: verify ARM compile issue on 3.1.13+ version (see https://gitlab.com/gitlab-org/gitlab/-/merge_requests/18828)
-gem 'bcrypt', '3.1.12'
+gem 'bcrypt', '~> 3.1', '>= 3.1.14'
 gem 'doorkeeper', '~> 5.5.0.rc2'
 gem 'doorkeeper-openid_connect', '~> 1.7.5'
 gem 'omniauth', '~> 1.8'

Gemfile.lock

@@ -128,7 +128,7 @@ GEM
     babosa (1.0.2)
     base32 (0.3.2)
     batch-loader (2.0.1)
-    bcrypt (3.1.12)
+    bcrypt (3.1.16)
     bcrypt_pbkdf (1.0.0)
     benchmark-ips (2.3.0)
     benchmark-memory (0.1.2)
@@ -1346,7 +1346,7 @@ DEPENDENCIES
   babosa (~> 1.0.2)
   base32 (~> 0.3.0)
   batch-loader (~> 2.0.1)
-  bcrypt (= 3.1.12)
+  bcrypt (~> 3.1, >= 3.1.14)
   bcrypt_pbkdf (~> 1.0)
   benchmark-ips (~> 2.3.0)
   benchmark-memory (~> 0.1)