summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-10-19 03:06:19 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-10-19 03:06:19 +0000
commitca9530a73b95eeb5fac76f9d543c2a3a550a5b76 (patch)
tree3ff7ab654a17d7240dd6b6f7acd522208c60eaec /Gemfile.lock
parentb3baf6f55132daab34c6bc9b6d98826dbee4fea9 (diff)
downloadgitlab-ce-ca9530a73b95eeb5fac76f9d543c2a3a550a5b76.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index e879fdc65fc..18160932c56 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -95,7 +95,7 @@ GEM
babosa (1.0.2)
base32 (0.3.2)
batch-loader (1.4.0)
- bcrypt (3.1.13)
+ bcrypt (3.1.12)
bcrypt_pbkdf (1.0.0)
benchmark-ips (2.3.0)
benchmark-memory (0.1.2)