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

05fdd12f

Commit 05fdd12f authored 9 years ago by Valery Sizov

Downloads
- Patches
- Plain Diff

Improve error message when merging fails

parent 2714d5b8

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG 1 addition, 0 deletions

CHANGELOG
app/assets/javascripts/merge_request_widget.js.coffee 6 additions, 5 deletions

app/assets/javascripts/merge_request_widget.js.coffee
app/controllers/projects/merge_requests_controller.rb 1 addition, 0 deletions

app/controllers/projects/merge_requests_controller.rb
app/services/merge_requests/merge_service.rb 4 additions, 0 deletions

app/services/merge_requests/merge_service.rb
db/migrate/20150930001110_merge_request_error_field.rb 5 additions, 0 deletions

db/migrate/20150930001110_merge_request_error_field.rb
db/schema.rb 2 additions, 1 deletion

db/schema.rb
spec/services/merge_requests/merge_service_spec.rb 14 additions, 0 deletions

spec/services/merge_requests/merge_service_spec.rb

with 33 additions and 6 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