summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-06-20 09:59:30 +0000
committerRémy Coutable <remy@rymai.me>2018-06-20 09:59:30 +0000
commit52b9cead80a51fcf6d293f2b3cd29f23e5e71a2d (patch)
tree3d3fb158f867317cf4f309f568878a72ab84e058 /changelogs
parented2fde007132533008b669be764cbc231a456a44 (diff)
parent74bb2e728b8daab4073d15370ecee32ed8458a02 (diff)
downloadgitlab-ce-52b9cead80a51fcf6d293f2b3cd29f23e5e71a2d.tar.gz
Merge branch 'rails5-fix-pages-controller' into 'master'
Rails5 fix Projects::PagesController spec See merge request gitlab-org/gitlab-ce!20007
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/rails5-fix-pages-controller.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/rails5-fix-pages-controller.yml b/changelogs/unreleased/rails5-fix-pages-controller.yml
new file mode 100644
index 00000000000..eeb3747c4eb
--- /dev/null
+++ b/changelogs/unreleased/rails5-fix-pages-controller.yml
@@ -0,0 +1,5 @@
+---
+title: Rails5 fix Projects::PagesController spec
+merge_request: 20007
+author: Jasper Maes
+type: fixed