Merge branch 'bcrypt-update' into 'master'

update to support latest bcrypt. resolves #48149

Closes #48149

See merge request gitlab-org/gitlab-ce!20260

Gemfile.lock

@@ -76,7 +76,7 @@ GEM
     babosa (1.0.2)
     base32 (0.3.2)
     batch-loader (1.2.1)
-    bcrypt (3.1.11)
+    bcrypt (3.1.12)
     bcrypt_pbkdf (1.0.0)
     benchmark-ips (2.3.0)
     better_errors (2.1.1)

changelogs/unreleased/update-bcrypt-to-support-libxcrypt.yml

+---
+title: update bcrypt to also support libxcrypt
+merge_request: 20260
+author: muhammadn
+type: other