From 8dba8e2d42e0e637e2267b21fc06bd9aa8d2efcd Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@selenight.nl>
Date: Wed, 10 Aug 2016 22:40:43 -0500
Subject: [PATCH] Get conflict resolution to work for MRs from forks
---
app/controllers/projects/merge_requests_controller.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 172df9e1eb1..076b5254b1b 100644
--- 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
--
GitLab