Skip to content

G
gitlab-ce
Commit 8dba8e2d authored by Douwe Maan's avatar Douwe Maan Committed by Fatih Acet
Browse files
Options

Get conflict resolution to work for MRs from forks

parent 4d7c2014
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
app/controllers/projects/merge_requests_controller.rb
View file @ 8dba8e2d
...@@ -163,7 +163,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController ...@@ -163,7 +163,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
end end
begin begin
MergeRequests::ResolveService.new(project, current_user, params).execute(@merge_request) MergeRequests::ResolveService.new(@merge_request.source_project, current_user, params).execute(@merge_request)
flash[:conflicts_message] = 'Merge conflicts resolved.' flash[:conflicts_message] = 'Merge conflicts resolved.'
flash.keep flash.keep
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7