Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Jérome Perrin
gitlab-ce
Repository
8dba8e2d42e0e637e2267b21fc06bd9aa8d2efcd
Switch branch/tag
gitlab-ce
app
controllers
projects
merge_requests_controller.rb
Find file
Blame
History
Permalink
Get conflict resolution to work for MRs from forks
· 8dba8e2d
Douwe Maan
authored
Aug 10, 2016
8dba8e2d
merge_requests_controller.rb
15.2 KB
Edit
Web IDE
Replace merge_requests_controller.rb
×
Attach a file by drag & drop or
click to upload
local_assigns[:label_text] || Commit message
Replace merge_requests_controller.rb
Replace file
Cancel
A new branch will be created in your fork and a new merge request will be started.
