Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
03ffe1b7b653
Commit
8dba8e2d
authored
Aug 10, 2016
by
Douwe Maan
Committed by
Fatih Acet
Aug 12, 2016
Browse files
Get conflict resolution to work for MRs from forks
parent
25ef149f51e7
Changes
1
Hide whitespace changes
Inline
Side-by-side
app/controllers/projects/merge_requests_controller.rb
View file @
03ffe1b7
...
...
@@ -163,7 +163,7 @@ def resolve_conflicts
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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment