Commit 51a921ba authored by Bob Van Landuyt's avatar Bob Van Landuyt

A simpler implementation of finding a merge request

Following a discussion in !7180
parent 469dfa43
...@@ -28,14 +28,6 @@ module API ...@@ -28,14 +28,6 @@ module API
new_params new_params
end end
def merge_request_for_resolving_discussions
return unless merge_request_iid = params[:merge_request_for_resolving_discussions]
@merge_request_for_resolving_discussions ||= MergeRequestsFinder.new(current_user, project_id: user_project.id).
execute.
find_by(iid: merge_request_iid)
end
end end
resource :issues do resource :issues do
...@@ -179,7 +171,12 @@ module API ...@@ -179,7 +171,12 @@ module API
attrs = attributes_for_keys(keys) attrs = attributes_for_keys(keys)
attrs[:labels] = params[:labels] if params[:labels] attrs[:labels] = params[:labels] if params[:labels]
attrs[:merge_request_for_resolving_discussions] = merge_request_for_resolving_discussions if params[:merge_request_for_resolving_discussions]
if merge_request_iid = params[:merge_request_for_resolving_discussions]
attrs[:merge_request_for_resolving_discussions] = MergeRequestsFinder.new(current_user, project_id: user_project.id).
execute.
find_by(iid: merge_request_iid)
end
# Convert and filter out invalid confidential flags # Convert and filter out invalid confidential flags
attrs['confidential'] = to_boolean(attrs['confidential']) attrs['confidential'] = to_boolean(attrs['confidential'])
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment