diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-24 21:09:54 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-24 21:09:54 +0300 |
commit | dc900fdc5f4c353ff2e261fc64fbbb0d87af1735 (patch) | |
tree | 62e1b6c93128a67b8dff2045c65342f8f7b03949 /app/services/merge_requests | |
parent | 8d98d0dd3abaacdeaf183b9ea39a292ea52cae45 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/merge_requests')
-rw-r--r-- | app/services/merge_requests/base_service.rb | 3 | ||||
-rw-r--r-- | app/services/merge_requests/build_service.rb | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/app/services/merge_requests/base_service.rb b/app/services/merge_requests/base_service.rb index 0fc85675e49..a50a15c888e 100644 --- a/app/services/merge_requests/base_service.rb +++ b/app/services/merge_requests/base_service.rb @@ -185,8 +185,7 @@ module MergeRequests # Only supported for merged MRs. def filter_locked_labels(merge_request) return unless params[:remove_label_ids].present? - return unless merge_request.merged? - return unless Feature.enabled?(:enforce_locked_labels_on_merge, merge_request.project, type: :ops) + return unless merge_request.supports_lock_on_merge? params[:remove_label_ids] -= labels_service.filter_locked_labels_ids_in_param(:remove_label_ids) end diff --git a/app/services/merge_requests/build_service.rb b/app/services/merge_requests/build_service.rb index b8853e8bcbc..b24bbe1b9d9 100644 --- a/app/services/merge_requests/build_service.rb +++ b/app/services/merge_requests/build_service.rb @@ -74,7 +74,7 @@ module MergeRequests # IssuableBaseService#process_label_ids and # IssuableBaseService#process_assignee_ids take care # of the removal. - params[:label_ids] = process_label_ids(params, extra_label_ids: merge_request.label_ids.to_a) + params[:label_ids] = process_label_ids(params, issuable: merge_request, extra_label_ids: merge_request.label_ids.to_a) params[:assignee_ids] = process_assignee_ids(params, extra_assignee_ids: merge_request.assignee_ids.to_a) |