Commit 2203cce2 authored by Thong Kuah's avatar Thong Kuah

Merge branch 'fix-gemfile-parallel-dependency' into 'master'

Fix mismatch parallel dependency in Gemfile

See merge request gitlab-org/gitlab!22510
parents f5e832bd 41141ab3
...@@ -389,7 +389,7 @@ group :development, :test do ...@@ -389,7 +389,7 @@ group :development, :test do
gem 'png_quantizator', '~> 0.2.1', require: false gem 'png_quantizator', '~> 0.2.1', require: false
gem 'parallel', '~> 1.17.0', require: false gem 'parallel', '~> 1.19', require: false
end end
# Gems required in omnibus-gitlab pipeline # Gems required in omnibus-gitlab pipeline
......
...@@ -1287,7 +1287,7 @@ DEPENDENCIES ...@@ -1287,7 +1287,7 @@ DEPENDENCIES
omniauth_crowd (~> 2.2.0) omniauth_crowd (~> 2.2.0)
omniauth_openid_connect (~> 0.3.3) omniauth_openid_connect (~> 0.3.3)
org-ruby (~> 0.9.12) org-ruby (~> 0.9.12)
parallel (~> 1.17.0) parallel (~> 1.19)
peek (~> 1.1) peek (~> 1.1)
pg (~> 1.1) pg (~> 1.1)
png_quantizator (~> 0.2.1) png_quantizator (~> 0.2.1)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment