diff options
| author | Jasper Maes <jaspermaes.jm@gmail.com> | 2018-06-16 08:49:56 +0200 |
|---|---|---|
| committer | Jasper Maes <jaspermaes.jm@gmail.com> | 2018-06-16 08:56:39 +0200 |
| commit | ecee6cd88fb87bebe637babbd8344d4c6b2a9c2a (patch) | |
| tree | f33ac2356b7d1fbe21ab2e0f8e60b9b7bc0a2ce2 | |
| parent | f733d4f8979a7570a9347186dbe0f8c663c2ff4f (diff) | |
| download | gitlab-ce-ecee6cd88fb87bebe637babbd8344d4c6b2a9c2a.tar.gz | |
Rails5 update Gemfile.rails5.lock
| -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 |