gitlab-org--gitlab-foss/app/services/merge_requests
Sean McGivern 4209b647f8 Don't mark empty MRs as merged on push to the target branch
When we push to an MR's target branch, we check if the MR's HEAD commit is
contained in the push. This lets us mark MRs as merged if they were merged
manually.

However, we also added a feature where you can create an empty MR from an
issue. If that MR is created around the time of a merge to the default branch,
we would process the push after creating the MR, and consider it to be a manual
merge.

To fix that, we exclude empty MRs from this process. If they are empty, they
were empty before the push we're processing, so we shouldn't touch them!
2017-07-07 15:34:33 +01:00
..
conflicts Enable Style/DotPosition Rubocop 👮 2017-06-21 13:48:12 +00:00
add_todo_when_build_fails_service.rb Make it possible to resolve all todos for pipeline 2017-02-15 10:54:33 +01:00
assign_issues_service.rb Backport of multiple_assignees_feature [ci skip] 2017-05-04 17:11:53 +03:00
base_service.rb Backport of multiple_assignees_feature [ci skip] 2017-05-04 17:11:53 +03:00
build_service.rb Fix 404 when upstream has disabled merge requests 2017-04-27 01:04:07 +03:00
close_service.rb Fix counters cache invalidation for Issues and Merge Requests 2017-05-26 17:43:51 +03:00
create_from_issue_service.rb Allow to create new branch and empty WIP merge request from issue page 2017-05-04 08:09:21 +00:00
create_service.rb Fix race condition between pipeline creation and MR diff_head_sha update 2017-06-01 13:31:52 -05:00
get_urls_service.rb Create and use project path helpers that only need a project, no namespace 2017-07-05 11:11:59 -05:00
merge_request_diff_cache_service.rb switch from diff_file_collection to diffs 2016-08-03 07:00:20 +02:00
merge_service.rb Prevent accidental deletion of protected MR source branch by repeating checks before actual deletion 2017-07-04 10:55:36 -05:00
merge_when_pipeline_succeeds_service.rb Update occurrences of MWBS to MWPS 2017-03-01 12:02:02 +01:00
post_merge_service.rb Fix counters cache invalidation for Issues and Merge Requests 2017-05-26 17:43:51 +03:00
refresh_service.rb Don't mark empty MRs as merged on push to the target branch 2017-07-07 15:34:33 +01:00
reopen_service.rb Fix counters cache invalidation for Issues and Merge Requests 2017-05-26 17:43:51 +03:00
resolved_discussion_notification_service.rb Address review feedback 2016-08-16 11:04:26 -05:00
update_service.rb Rename "Slash commands" to "Quick actions" 2017-06-15 09:01:56 -05:00