services

19014 commits behind the upstream repository.

Properly abort a merge when merge conflicts occur

Stan Hu authored 8 years ago

If somehow a user attempted to accept a merge request that had
conflicts (e.g. the "Accept Merge Request" button or the MR itself was
not updated), `MergeService` did not properly detect that a conflict
occurred. It would assume that the MR went through without any issues
and close the MR as though everything was fine. This could cause
data loss if the source branch were removed.

Closes #20425

60529e02

History

60529e02 8 years ago

History

Name	Last commit	Last update
..
auth
ci
groups
issues
members
merge_requests
milestones
notes
projects
search
create_commit_builds_service_spec.rb
create_deployment_service_spec.rb
create_release_service_spec.rb
create_snippet_service_spec.rb
create_tag_service_spec.rb
delete_tag_service_spec.rb
delete_user_service_spec.rb
destroy_group_service_spec.rb
event_create_service_spec.rb
git_hooks_service_spec.rb
git_push_service_spec.rb
git_tag_push_service_spec.rb
notification_service_spec.rb
repair_ldap_blocked_user_service_spec.rb
repository_archive_clean_up_service_spec.rb
search_service_spec.rb
system_hooks_service_spec.rb
system_note_service_spec.rb
test_hook_service_spec.rb
todo_service_spec.rb
update_release_service_spec.rb
update_snippet_service_spec.rb

Admin message

Admin message

services