summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorBob Van Landuyt <bob@gitlab.com>2017-03-10 19:24:09 +0100
committerBob Van Landuyt <bob@gitlab.com>2017-03-13 08:27:52 +0100
commit92f82773900882ce9769fc05ce214d240abd5a62 (patch)
tree5a2cba635b574f24a08945a6db6769b0b2f029b6 /lib
parent0c6e685f8c6320312ed2272abc59be926e006d7c (diff)
downloadgitlab-ce-92f82773900882ce9769fc05ce214d240abd5a62.tar.gz
Make API v3 work with the new param name
Diffstat (limited to 'lib')
-rw-r--r--lib/api/v3/issues.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/api/v3/issues.rb b/lib/api/v3/issues.rb
index bb3535bedf8..258cbfed022 100644
--- a/lib/api/v3/issues.rb
+++ b/lib/api/v3/issues.rb
@@ -139,6 +139,7 @@ module API
end
issue_params = declared_params(include_missing: false)
+ issue_params = issue_params.merge(merge_request_to_resolve_discussions_of: issue_params.delete(:merge_request_for_resolving_discussions))
issue = ::Issues::CreateService.new(user_project,
current_user,