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

ccdf08d8

Commit ccdf08d8 authored 10 years ago by Dmitriy Zaporozhets

Downloads
- Patches
- Plain Diff

Refactor merge request merge service

* Add system note when user merges MR in same way as it closes it
* Remove duplicating code

parent b55a0519

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

app/models/merge_request.rb 3 additions, 1 deletion

app/models/merge_request.rb
app/services/merge_requests/auto_merge_service.rb 4 additions, 3 deletions

app/services/merge_requests/auto_merge_service.rb
app/services/merge_requests/base_merge_service.rb 1 addition, 12 deletions

app/services/merge_requests/base_merge_service.rb
app/services/merge_requests/merge_service.rb 5 additions, 3 deletions

app/services/merge_requests/merge_service.rb
app/services/merge_requests/refresh_service.rb 3 additions, 1 deletion

app/services/merge_requests/refresh_service.rb

with 16 additions and 20 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