diff options
| author | Muhammad Nuzaihan <muhammad@taqisystems.com> | 2018-07-01 08:13:41 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-07-01 08:13:41 +0000 |
| commit | 912fe2c58f9c05bbe1ea860261c567146814a25c (patch) | |
| tree | cd261cd7d5eecf137c6b8d7b817fc0870ed52e72 | |
| parent | 7f9dfacf4ff058c6cae6c6c26cf859201cd536c2 (diff) | |
| download | gitlab-ce-912fe2c58f9c05bbe1ea860261c567146814a25c.tar.gz | |
update to support latest bcrypt. resolves #48149
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/update-bcrypt-to-support-libxcrypt.yml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 79e3888fa64..1cd336c95d0 100644 --- 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) diff --git a/changelogs/unreleased/update-bcrypt-to-support-libxcrypt.yml b/changelogs/unreleased/update-bcrypt-to-support-libxcrypt.yml new file mode 100644 index 00000000000..c18a0f75d22 --- /dev/null +++ b/changelogs/unreleased/update-bcrypt-to-support-libxcrypt.yml @@ -0,0 +1,5 @@ +--- +title: update bcrypt to also support libxcrypt +merge_request: 20260 +author: muhammadn +type: other |