diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-20 13:00:54 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-20 13:00:54 +0300 |
| commit | 3cccd102ba543e02725d247893729e5c73b38295 (patch) | |
| tree | f36a04ec38517f5deaaacb5acc7d949688d1e187 /app/services/merge_requests | |
| parent | 205943281328046ef7b4528031b90fbda70c75ac (diff) | |
Add latest changes from gitlab-org/gitlab@14-10-stable-eev14.10.0-rc42
Diffstat (limited to 'app/services/merge_requests')
| -rw-r--r-- | app/services/merge_requests/base_service.rb | 2 | ||||
| -rw-r--r-- | app/services/merge_requests/update_service.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/services/merge_requests/base_service.rb b/app/services/merge_requests/base_service.rb index 2ab623bacf8..d197c13378a 100644 --- a/app/services/merge_requests/base_service.rb +++ b/app/services/merge_requests/base_service.rb @@ -72,7 +72,7 @@ module MergeRequests end def cancel_review_app_jobs!(merge_request) - environments = merge_request.environments.in_review_folder.available + environments = merge_request.environments_in_head_pipeline.in_review_folder.available environments.each { |environment| environment.cancel_deployment_jobs! } end diff --git a/app/services/merge_requests/update_service.rb b/app/services/merge_requests/update_service.rb index c5395138902..391079223ca 100644 --- a/app/services/merge_requests/update_service.rb +++ b/app/services/merge_requests/update_service.rb @@ -34,6 +34,7 @@ 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) |