Get conflict resolution to work for MRs from forks

8dba8e2d · Douwe Maan · Fatih Acet · 4d7c2014 · 8dba8e2d
Commit 8dba8e2d authored Aug 10, 2016 by Douwe Maan Committed by Fatih Acet Aug 12, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

app/controllers/projects/merge_requests_controller.rb app/controllers/projects/merge_requests_controller.rb +1 -1

No files found.
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -163,7 +163,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
    end

    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.keep