Skip to content

GitLab

Why GitLab
Pricing
Contact Sales
Explore

Sign in
Get free trial

Primary navigation

Project

GitLab Community Edition
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Jira
- Environments
- Incidents

Snippets Groups Projects

Admin message

Do not update/delete: Banner broadcast message test data

Admin message

Do not update/delete: Notification broadcast message test data

66ffa28e

Commit 66ffa28e authored 8 years ago by Fatih Acet

Downloads
- Patches
- Plain Diff

Remove Conflicts tab make it a page instead.

parent 5625e828

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

app/controllers/projects/merge_requests_controller.rb 1 addition, 4 deletions

app/controllers/projects/merge_requests_controller.rb
app/views/projects/merge_requests/_show.html.haml 0 additions, 7 deletions

app/views/projects/merge_requests/_show.html.haml
app/views/projects/merge_requests/conflicts.haml 111 additions, 0 deletions

app/views/projects/merge_requests/conflicts.haml
app/views/projects/merge_requests/show/_conflicts.html.haml 0 additions, 103 deletions

app/views/projects/merge_requests/show/_conflicts.html.haml

with 112 additions and 114 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment