Skip to content

GitLab

Why GitLab
Pricing
Contact Sales
Explore

Sign in
Get free trial

Primary navigation

Project

GitLab FOSS
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Jira
- Releases
- Model registry
- 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

f50b7b5c

Commit f50b7b5c authored 10 years ago by Dmitriy Zaporozhets

Downloads
- Plain Diff

Merge branch 'merge-system-note' into 'master'

Refactor merge request merge service

See merge request !1374

parents 6e5c72f8 ee9849b7

No related branches found

No related tags found

Loading

Changes 6

Show 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 4 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
spec/services/merge_requests/refresh_service_spec.rb 4 additions, 4 deletions

spec/services/merge_requests/refresh_service_spec.rb

with 19 additions and 24 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