Use same gem versions for rails5 as for rails4 where possible

d18002ef · Jasper Maes · 10fd34ba · d18002ef · d18002ef · d18002ef
Commit d18002ef authored Jun 06, 2018 by Jasper Maes
Showing with 128 additions and 114 deletions

Gemfile.lock Gemfile.lock +0 -1

Gemfile.rails5.lock Gemfile.rails5.lock +123 -113

changelogs/unreleased/rails5-fix-47370.yml changelogs/unreleased/rails5-fix-47370.yml +5 -0

No files found.
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -452,7 +452,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
--- a/changelogs/unreleased/rails5-fix-47370.yml
+++ b/changelogs/unreleased/rails5-fix-47370.yml
+---
+title: Use same gem versions for rails5 as for rails4 where possible
+merge_request: 19498
+author: Jasper Maes
+type: fixed