Commit 8dba8e2d authored by Douwe Maan's avatar Douwe Maan Committed by Fatih Acet
Browse files

Get conflict resolution to work for MRs from forks

parent 25ef149f51e7
......@@ -163,7 +163,7 @@ def resolve_conflicts
begin, current_user, params).execute(@merge_request), current_user, params).execute(@merge_request)
flash[:conflicts_message] = 'Merge conflicts resolved.'
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