Skip to content

Fix mismatch parallel dependency in Gemfile

Dylan Griffith requested to merge fix-gemfile-parallel-dependency into master

What does this MR do?

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:

This MR assumes we are ok with 1.19.1 and updates the Gemfile to reflect that. It also switches to using ~> 1.19 version locking in Gemfile to be a little less strict about the versioning than we were before. In fact if we had been less strict before and just used ~> 1.17 we wouldn't have had any conflict to begin with.

Screenshots

Does this MR meet the acceptance criteria?

Conformity

Availability and Testing

Security

If this MR contains changes to processing or storing of credentials or tokens, authorization and authentication methods and other items described in the security review guidelines:

  • Label as security and @ mention @gitlab-com/gl-security/appsec
  • The MR includes necessary changes to maintain consistency between UI, API, email, or other methods
  • Security reports checked/validated by a reviewer from the AppSec team

Merge request reports