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

ba327e69

Commit ba327e69 authored 8 years ago by Sean McGivern Committed by Fatih Acet 8 years ago

Downloads
- Patches
- Plain Diff

Move resolving code to ResolveService

parent ac9229a3

No related branches found

No related tags found

No related merge requests found

Changes 5

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/repository.rb 8 additions, 0 deletions

app/models/repository.rb
app/services/merge_requests/resolve_service.rb 31 additions, 0 deletions

app/services/merge_requests/resolve_service.rb
lib/gitlab/conflict/file.rb 0 additions, 8 deletions

lib/gitlab/conflict/file.rb
lib/gitlab/conflict/file_collection.rb 0 additions, 21 deletions

lib/gitlab/conflict/file_collection.rb

with 40 additions and 30 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