Add latest changes from gitlab-org/gitlab@master

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)