kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity
gitlab-org--gitlab-foss/app/services
History
Stan Hu 60529e0216 Properly abort a merge when merge conflicts occur 
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
 		2016-07-29 11:21:21 -07:00
..
auth Fix private method visibility in container registry 2016-07-19 15:12:06 +02:00
ci Add notice implementation 2016-07-18 14:59:01 +02:00
commits Revert "Revert "Merge branch '18193-developers-can-merge' into 'master' "" 2016-07-18 10:16:56 +02:00
files Merge branch 'master' into rename-repo-files 2016-07-19 11:23:08 +01:00
groups Address feedback 2016-03-22 00:09:20 +01:00
issues Refactor spam validation to a concern that can be easily reused and improve legibility in `SpamCheckService` 2016-07-26 19:29:16 -05:00
members Raise a new Gitlab::Access::AccessDeniedError when permission is not enough to destroy a member 2016-06-18 06:06:34 +02:00
merge_requests Properly abort a merge when merge conflicts occur 2016-07-29 11:21:21 -07:00
milestones Enable Style/EmptyLines cop, remove redundant ones 2016-07-01 21:56:17 +02:00
notes Fix not normalized emoji paths 2016-07-14 08:51:00 +02:00
oauth2 Enable Style/EmptyLinesAroundAccessModifier rubocop cop 2016-06-03 10:34:20 +02:00
projects Fix Project#to_param to keep invalid project suitable for use in URLs 2016-07-27 13:52:45 -03:00
protected_branches Implement final review comments from @rymai. 2016-07-29 15:20:39 +05:30
search Restrict access to confidential issues on search results 2016-03-17 20:55:59 -03:00
wiki_pages Enable Style/EmptyLines cop, remove redundant ones 2016-07-01 21:56:17 +02:00
audit_event_service.rb Services: code style fixes, minor refactoring 2016-07-06 20:58:43 +03:00
base_service.rb Tweaks, refactoring, and specs 2016-03-20 21:04:07 +01:00
compare_service.rb Remove unused argument to CompareService#execute 2016-07-08 13:53:17 +01:00
create_branch_service.rb Fix of 'Commits being passed to custom hooks are already reachable when using the UI' 2016-07-19 07:45:22 +03:00
create_commit_builds_service.rb Track a user who created a pipeline 2016-07-15 17:42:27 +02:00
create_deployment_service.rb Revert "squashed merge and fixed conflicts" 2016-06-16 12:59:07 +02:00
create_release_service.rb Services: code style fixes, minor refactoring 2016-07-06 20:58:43 +03:00
create_snippet_service.rb Services: code style fixes, minor refactoring 2016-07-06 20:58:43 +03:00
create_spam_log_service.rb Support Akismet spam checking for creation of issues via API 2016-02-02 11:25:44 -02:00
create_tag_service.rb Services: code style fixes, minor refactoring 2016-07-06 20:58:43 +03:00
delete_branch_service.rb Update to gitlab_git 10.4.1 and take advantage of preserved Ref objects 2016-07-28 12:24:47 -04:00
delete_tag_service.rb Update to gitlab_git 10.4.1 and take advantage of preserved Ref objects 2016-07-28 12:24:47 -04:00
delete_user_service.rb Clearify who deletes the user 2016-03-15 21:09:25 +01:00
destroy_group_service.rb Add ability to delete a user with force 2016-03-15 21:09:25 +01:00
event_create_service.rb Create a "destroyed Milestone" event and keep Milestone events around in the DB 2015-09-15 05:51:11 -07:00
git_hooks_service.rb Better message for git hooks and file locks 2016-07-04 15:31:49 +03:00
git_push_service.rb Use `Gitlab::Access` to protected branch access levels. 2016-07-29 15:20:39 +05:30
git_tag_push_service.rb Update to gitlab_git 10.4.1 and take advantage of preserved Ref objects 2016-07-28 12:24:47 -04:00
gravatar_service.rb Add support for HiDPI displays in gravatar service 2015-09-26 20:53:16 +02:00
issuable_base_service.rb Allow bulk (un)subscription from issues in issue index 2016-07-14 19:36:19 -03:00
notification_service.rb Services: code style fixes, minor refactoring 2016-07-06 20:58:43 +03:00
repair_ldap_blocked_user_service.rb Code style fixes and some code simplified 2016-01-08 16:26:04 -02:00
repository_archive_clean_up_service.rb Use find instead Ruby to remove files due to performance reasons 2016-07-21 10:31:49 -03:00
spam_check_service.rb Refactor spam validation to a concern that can be easily reused and improve legibility in `SpamCheckService` 2016-07-26 19:29:16 -05:00
system_hooks_service.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
system_note_service.rb Refactor system notes service to make it singleton 2016-07-19 15:12:14 +02:00
test_hook_service.rb Added X-GitLab-Event header for web hooks 2015-05-08 16:49:03 +03:00
todo_service.rb When Issue author assign or mention himself Todos are created 2016-07-14 10:56:44 +02:00
update_release_service.rb Services: code style fixes, minor refactoring 2016-07-06 20:58:43 +03:00
update_snippet_service.rb Services: code style fixes, minor refactoring 2016-07-06 20:58:43 +03:00