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

cf4cbb01

Commit cf4cbb01 authored 8 years ago by Douwe Maan Committed by Fatih Acet 8 years ago

Downloads
- Patches
- Plain Diff

Rename `can_resolve_conflicts_in_ui?` to `conflicts_can_be_resolved_in_ui?`

parent 79274844

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

app/controllers/projects/merge_requests_controller.rb 1 addition, 1 deletion

app/controllers/projects/merge_requests_controller.rb
app/models/merge_request.rb 7 additions, 5 deletions

app/models/merge_request.rb
app/views/projects/merge_requests/widget/open/_conflicts.html.haml 1 addition, 1 deletion

.../projects/merge_requests/widget/open/_conflicts.html.haml
spec/models/merge_request_spec.rb 8 additions, 8 deletions

spec/models/merge_request_spec.rb

with 17 additions and 15 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