Add latest changes from gitlab-org/gitlab@master

ca9530a7 · GitLab Bot · b3baf6f5 · ca9530a7
Commit ca9530a7 authored 5 years ago by GitLab Bot
--- 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)