diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-10 15:08:08 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-10 15:08:08 +0000 |
commit | 7c38405be9e79099f399aa429503ea7b463bbf5a (patch) | |
tree | 30944a8baf135021395574e081f53ed5f756ace0 /app/services/merge_requests | |
parent | 1fa79760ad2d4bd67f5c5a27f372a7533b9b7c69 (diff) | |
download | gitlab-ce-7c38405be9e79099f399aa429503ea7b463bbf5a.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/merge_requests')
-rw-r--r-- | app/services/merge_requests/update_service.rb | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/app/services/merge_requests/update_service.rb b/app/services/merge_requests/update_service.rb index 1dc5503d368..1516e33a7c6 100644 --- a/app/services/merge_requests/update_service.rb +++ b/app/services/merge_requests/update_service.rb @@ -43,11 +43,7 @@ module MergeRequests abort_auto_merge(merge_request, 'target branch was changed') end - if merge_request.assignees != old_assignees - create_assignee_note(merge_request, old_assignees) - notification_service.async.reassigned_merge_request(merge_request, current_user, old_assignees) - todo_service.reassigned_issuable(merge_request, current_user, old_assignees) - end + handle_assignees_change(merge_request, old_assignees) if merge_request.assignees != old_assignees if merge_request.previous_changes.include?('target_branch') || merge_request.previous_changes.include?('source_branch') @@ -120,6 +116,12 @@ module MergeRequests end end + def handle_assignees_change(merge_request, old_assignees) + create_assignee_note(merge_request, old_assignees) + notification_service.async.reassigned_merge_request(merge_request, current_user, old_assignees) + todo_service.reassigned_issuable(merge_request, current_user, old_assignees) + end + def create_branch_change_note(issuable, branch_type, old_branch, new_branch) SystemNoteService.change_branch( issuable, issuable.project, current_user, branch_type, |