diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-19 15:11:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-19 15:11:06 +0300 |
commit | 1fdc1d34e8e3cab28cd010a2b352974da9847e8e (patch) | |
tree | a8158b1ef1a1f09ccb7d4789a3d7e519d8825b37 /Gemfile.lock | |
parent | c44a81b8b9f4c27bec1f6df6ea25f135c390b730 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index ca1cfc30419..a8f9fea0a59 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -127,7 +127,7 @@ GEM nokogiri (~> 1.11.0.rc2) babosa (1.0.2) base32 (0.3.2) - batch-loader (1.4.0) + batch-loader (2.0.1) bcrypt (3.1.12) bcrypt_pbkdf (1.0.0) benchmark-ips (2.3.0) @@ -1302,7 +1302,7 @@ DEPENDENCIES aws-sdk-s3 (~> 1) babosa (~> 1.0.2) base32 (~> 0.3.0) - batch-loader (~> 1.4.0) + batch-loader (~> 2.0.1) bcrypt (= 3.1.12) bcrypt_pbkdf (~> 1.0) benchmark-ips (~> 2.3.0) |