Merge branch 'blackst0ne-update-gemfile-rails5-lock' into 'master'

[Rails5] Update Gemfile lock-files See merge request gitlab-org/gitlab-ee!6057

Merge branch 'blackst0ne-update-gemfile-rails5-lock' into 'master'
[Rails5] Update Gemfile lock-files See merge request gitlab-org/gitlab-ee!6057
346398ad · Douwe Maan · 85a62776 · edc73561 · 346398ad · 346398ad
Commit 346398ad authored Jun 08, 2018 by Douwe Maan
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 123 additions and 120 deletions

Gemfile.lock Gemfile.lock +0 -1

Gemfile.rails5.lock Gemfile.rails5.lock +123 -119

No files found.
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -480,7 +480,6 @@ GEM
    kgio (2.10.0)
    knapsack (1.16.0)
      rake
-      timecop (>= 0.1.0)
    kubeclient (3.1.0)
      http (~> 2.2.2)
      recursive-open-struct (~> 1.0, >= 1.0.4)

--- a/Gemfile.rails5.lock
+++ b/Gemfile.rails5.lock