summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-08 03:08:05 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-08 03:08:05 +0000
commit30010b161d42bdac3ab5cd16e63cc61c2f4939f3 (patch)
tree57d1392d4d668d9369f0bd1bf7a42876d6f59506 /Gemfile.lock
parent2b3bfe8fc59ed4cdc385955cdb38cbd481b45426 (diff)
downloadgitlab-ce-30010b161d42bdac3ab5cd16e63cc61c2f4939f3.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 91376b5ee58..c5f3dc3e5a4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1287,7 +1287,7 @@ DEPENDENCIES
omniauth_crowd (~> 2.2.0)
omniauth_openid_connect (~> 0.3.3)
org-ruby (~> 0.9.12)
- parallel (~> 1.17.0)
+ parallel (~> 1.19)
peek (~> 1.1)
pg (~> 1.1)
png_quantizator (~> 0.2.1)