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
assign_issues_service.rb
base_service.rb
build_service.rb
close_service.rb
create_from_issue_service.rb
create_service.rb
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
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
post_merge_service.rb
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
resolved_discussion_notification_service.rb
update_service.rb Rename "Slash commands" to "Quick actions" 2017-06-15 09:01:56 -05:00