diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-12 15:09:17 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-12 15:09:17 +0000 |
commit | 901ecdbf5cccc7f40a4e959835389af19ddd87ee (patch) | |
tree | e882146114a6cc2c009d4e1c4229aaeccc226cc4 /app/services/merge_requests | |
parent | a99c04f0185d6a6b398c37630c392ca84494c0a5 (diff) | |
download | gitlab-ce-901ecdbf5cccc7f40a4e959835389af19ddd87ee.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 | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/services/merge_requests/update_service.rb b/app/services/merge_requests/update_service.rb index 98b120360cd..bc832690aa1 100644 --- a/app/services/merge_requests/update_service.rb +++ b/app/services/merge_requests/update_service.rb @@ -38,7 +38,6 @@ module MergeRequests handle_target_branch_change(merge_request) handle_milestone_change(merge_request) handle_draft_status_change(merge_request, changed_fields) - handle_label_changes(merge_request, old_labels) track_title_and_desc_edits(changed_fields) track_discussion_lock_toggle(merge_request, changed_fields) @@ -71,7 +70,7 @@ module MergeRequests MergeRequests::CloseService end - def after_update(issuable) + def after_update(issuable, old_associations) super issuable.cache_merge_request_closes_issues!(current_user) end |