summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-06-18 09:20:07 +0000
committerRémy Coutable <remy@rymai.me>2018-06-18 09:20:07 +0000
commit95753b5ec7050b2d7c9848546a0802bcff0702b6 (patch)
tree2d1a293a5de7bd46f27a93c95aaaeec9362ea265 /changelogs
parent781e0da9443ae0aa9937942a9adf67ef647ba7be (diff)
parentecee6cd88fb87bebe637babbd8344d4c6b2a9c2a (diff)
downloadgitlab-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
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/rails5-fix-48009.yml5
1 files changed, 5 insertions, 0 deletions
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