summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-06-20 10:00:32 +0000
committerRémy Coutable <remy@rymai.me>2018-06-20 10:00:32 +0000
commita88a9e22c5f27b458593d08ee9dce5a834c51f2a (patch)
treed21eec9ccf0127d9e9b4efd2ff0abccdac9ff841 /changelogs
parent52b9cead80a51fcf6d293f2b3cd29f23e5e71a2d (diff)
parent9214e273a8759cbcd21ea1ef62fd9d594cec1e1d (diff)
downloadgitlab-ce-a88a9e22c5f27b458593d08ee9dce5a834c51f2a.tar.gz
Merge branch 'rails5-fix-48104' into 'master'
Rails5 fix expected: 1 time with arguments: (97, anything, {"squash"=>false}) received: 0 times Closes #48104 See merge request gitlab-org/gitlab-ce!20004
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/rails5-fix-48104.yml6
1 files changed, 6 insertions, 0 deletions
diff --git a/changelogs/unreleased/rails5-fix-48104.yml b/changelogs/unreleased/rails5-fix-48104.yml
new file mode 100644
index 00000000000..6cf519ad791
--- /dev/null
+++ b/changelogs/unreleased/rails5-fix-48104.yml
@@ -0,0 +1,6 @@
+---
+title: 'Rails5 fix expected: 1 time with arguments: (97, anything, {"squash"=>false})
+ received: 0 times'
+merge_request: 20004
+author: Jasper Maes
+type: fixed