summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-07-09 16:00:39 +0000
committerRémy Coutable <remy@rymai.me>2018-07-09 16:00:39 +0000
commit4bb26e7dad14fbb0891b1d06f70deef6486c87ad (patch)
tree136e0852d23f713f166814b72a67c2a327b7ac6f /changelogs
parentb7b28363245f8b88558535a9dafa0d4fd4465021 (diff)
parent3d88f870b7c427a1284935fad467c6c125d4479a (diff)
downloadgitlab-ce-4bb26e7dad14fbb0891b1d06f70deef6486c87ad.tar.gz
Merge branch 'rails5-update-gemfile-lock' into 'master'
Update Gemfile.rails5.lock with latest Gemfile.lock changes See merge request gitlab-org/gitlab-ce!20466
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/rails5-update-gemfile-lock.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/rails5-update-gemfile-lock.yml b/changelogs/unreleased/rails5-update-gemfile-lock.yml
new file mode 100644
index 00000000000..58931587fff
--- /dev/null
+++ b/changelogs/unreleased/rails5-update-gemfile-lock.yml
@@ -0,0 +1,5 @@
+---
+title: Update Gemfile.rails5.lock with latest Gemfile.lock changes
+merge_request: 20466
+author: Jasper Maes
+type: fixed