Commit 41141ab3 authored by Dylan Griffith's avatar Dylan Griffith

Fix mismatch parallel dependency in Gemfile

The Gemfile specified version `~> 1.17.0` was mismatched with the
Gemfile.lock version `1.19.1`.

This seems have possibly occurred due to an issue with 2 different merge
requests changing this at the same time and being merged without
rebasing on each other:

- https://gitlab.com/gitlab-org/gitlab/merge_requests/20738
- https://gitlab.com/gitlab-org/gitlab/merge_requests/21886
parent 16761366
......@@ -389,7 +389,7 @@ group :development, :test do
gem 'png_quantizator', '~> 0.2.1', require: false
gem 'parallel', '~> 1.17.0', require: false
gem 'parallel', '~> 1.19', require: false
end
# Gems required in omnibus-gitlab pipeline
......
......@@ -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)
......
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