summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2018-11-21 07:05:02 -0800
committerStan Hu <stanhu@gmail.com>2018-11-21 07:08:34 -0800
commit4c4c8532d0710689cca2a3c71b134665d42e839a (patch)
tree6c093d981d1ee9595a9004c1ded90ad19bd8248d /changelogs
parentac6673ddcfda0a0229b86f22543d31ddccc1dc55 (diff)
downloadgitlab-ce-4c4c8532d0710689cca2a3c71b134665d42e839a.tar.gz
Handle force_remove_source_branch when creating merge requestsh-fix-issue-51220
Creating a merge request with `merge_request[force_remove_source_branch]` parameter would result in an Error 500 since this attribute was passed directly to the merge request. Fix this by properly parsing this attribute into `merge_params`. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51220
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/sh-fix-issue-51220.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/sh-fix-issue-51220.yml b/changelogs/unreleased/sh-fix-issue-51220.yml
new file mode 100644
index 00000000000..048f58611cb
--- /dev/null
+++ b/changelogs/unreleased/sh-fix-issue-51220.yml
@@ -0,0 +1,5 @@
+---
+title: Handle force_remove_source_branch when creating merge request
+merge_request: 23281
+author:
+type: fixed