diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-06-08 15:08:45 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-06-08 15:08:45 +0000 |
| commit | 6c963dcb39a2911c6cae1a70eb38574b8fd3ead6 (patch) | |
| tree | 94a574d28d46b4c24cff135f4909095efcae9163 /Gemfile.lock | |
| parent | 3cb560f83d7ac4e436f86b943b54560c0622d9bd (diff) | |
| parent | d18002efeda8ff10abe856e90cb1fa9de755974f (diff) | |
| download | gitlab-ce-6c963dcb39a2911c6cae1a70eb38574b8fd3ead6.tar.gz | |
Merge branch 'rails5-fix-47370' into 'master'
Use same gem versions for rails5 as for rails4 where possible
Closes #47370, #46232, #47367, and #47373
See merge request gitlab-org/gitlab-ce!19498
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 936cd9e8e47..0ce0312e743 100644 --- 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) |