diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-06-18 09:20:07 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-06-18 09:20:07 +0000 |
| commit | 95753b5ec7050b2d7c9848546a0802bcff0702b6 (patch) | |
| tree | 2d1a293a5de7bd46f27a93c95aaaeec9362ea265 | |
| parent | 781e0da9443ae0aa9937942a9adf67ef647ba7be (diff) | |
| parent | ecee6cd88fb87bebe637babbd8344d4c6b2a9c2a (diff) | |
| download | gitlab-ce-95753b5ec7050b2d7c9848546a0802bcff0702b6.tar.gz | |
Merge branch 'rails5-fix-48009' into 'master'
Rails5 update Gemfile.rails5.lock
Closes #48009
See merge request gitlab-org/gitlab-ce!19921
| -rw-r--r-- | Gemfile.rails5.lock | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/rails5-fix-48009.yml | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/Gemfile.rails5.lock b/Gemfile.rails5.lock index 952e27df29d..223717f1818 100644 --- a/Gemfile.rails5.lock +++ b/Gemfile.rails5.lock @@ -299,7 +299,7 @@ GEM flowdock (~> 0.7) gitlab-grit (>= 2.4.1) multi_json - gitlab-gollum-lib (4.2.7.2) + gitlab-gollum-lib (4.2.7.4) gemojione (~> 3.2) github-markup (~> 1.6) gollum-grit_adapter (~> 1.0) @@ -307,7 +307,7 @@ GEM rouge (~> 3.1) sanitize (~> 2.1) stringex (~> 2.6) - gitlab-gollum-rugged_adapter (0.4.4) + gitlab-gollum-rugged_adapter (0.4.4.1) mime-types (>= 1.15) rugged (~> 0.25) gitlab-grit (2.8.2) diff --git a/changelogs/unreleased/rails5-fix-48009.yml b/changelogs/unreleased/rails5-fix-48009.yml new file mode 100644 index 00000000000..7ade9ef2b7d --- /dev/null +++ b/changelogs/unreleased/rails5-fix-48009.yml @@ -0,0 +1,5 @@ +--- +title: Rails5 update Gemfile.rails5.lock +merge_request: 19921 +author: Jasper Maes +type: fixed |