update to support latest bcrypt. resolves #48149

912fe2c5 · Muhammad Nuzaihan · Rémy Coutable · 7f9dfacf · 912fe2c5 · 912fe2c5
Commit 912fe2c5 authored Jul 01, 2018 by Muhammad Nuzaihan Committed by Rémy Coutable Jul 01, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

Gemfile.lock Gemfile.lock +1 -1

changelogs/unreleased/update-bcrypt-to-support-libxcrypt.yml changelogs/unreleased/update-bcrypt-to-support-libxcrypt.yml +5 -0

No files found.
--- a/Gemfile.lock
+++ b/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)

--- a/changelogs/unreleased/update-bcrypt-to-support-libxcrypt.yml
+++ b/changelogs/unreleased/update-bcrypt-to-support-libxcrypt.yml
+---
+title: update bcrypt to also support libxcrypt
+merge_request: 20260
+author: muhammadn
+type: other