Merge branch 'fix-ordering-in-gemfile-lock' into 'master'

Fix gems ordering in Gemfile.lock See merge request gitlab-org/gitlab-ee!11503

Merge branch 'fix-ordering-in-gemfile-lock' into 'master'
Fix gems ordering in Gemfile.lock See merge request gitlab-org/gitlab-ee!11503
293c97b8 · Stan Hu · 7b2ebe34 · 1ef69234 · 293c97b8
Commit 293c97b8 authored Apr 24, 2019 by Stan Hu
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Gemfile.lock Gemfile.lock +2 -2

No files found.
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -310,13 +310,13 @@ GEM
    github-markup (1.7.0)
    gitlab-default_value_for (3.1.1)
      activerecord (>= 3.2.0, < 6.0)
-    gitlab-license (1.0.0)
    gitlab-labkit (0.1.2)
      actionpack (~> 5)
      activesupport (~> 5)
      grpc (~> 1.15)
      jaeger-client (~> 0.10)
      opentracing (~> 0.4)
+    gitlab-license (1.0.0)
    gitlab-markup (1.7.0)
    gitlab-sidekiq-fetcher (0.4.0)
      sidekiq (~> 5)
@@ -1093,8 +1093,8 @@ DEPENDENCIES
  gitaly-proto (~> 1.19.0)
  github-markup (~> 1.7.0)
  gitlab-default_value_for (~> 3.1.1)
-  gitlab-license (~> 1.0)
  gitlab-labkit (~> 0.1.2)
+  gitlab-license (~> 1.0)
  gitlab-markup (~> 1.7.0)
  gitlab-sidekiq-fetcher (~> 0.4.0)
  gitlab-styles (~> 2.5)