summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-06-20 11:21:57 +0000
committerRémy Coutable <remy@rymai.me>2018-06-20 11:21:57 +0000
commit9fe7079a9684b7fbdd82134460bb0d98d992b196 (patch)
tree9949159e6d9f2db453b5430b080b53b1b96e3eb6 /changelogs
parent4d699476207f220a1f7e73b9ee84aedebe77e743 (diff)
parentce30d14be5d9a403537a83dc005bee10e9825cea (diff)
downloadgitlab-ce-9fe7079a9684b7fbdd82134460bb0d98d992b196.tar.gz
Merge branch 'rails5-fix-48141' into 'master'
Rails5 fix expected: 0 times with any arguments received: 1 time with… Closes #48141 See merge request gitlab-org/gitlab-ce!20018
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/rails5-fix-48141.yml6
1 files changed, 6 insertions, 0 deletions
diff --git a/changelogs/unreleased/rails5-fix-48141.yml b/changelogs/unreleased/rails5-fix-48141.yml
new file mode 100644
index 00000000000..5e2aa23b8fb
--- /dev/null
+++ b/changelogs/unreleased/rails5-fix-48141.yml
@@ -0,0 +1,6 @@
+---
+title: 'Rails5 fix expected: 0 times with any arguments received: 1 time with arguments:
+ DashboardController'
+merge_request: 20018
+author: Jasper Maes
+type: fixed