diff options
Diffstat (limited to 'app/services/labels/create_service.rb')
| -rw-r--r-- | app/services/labels/create_service.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/services/labels/create_service.rb b/app/services/labels/create_service.rb index 675439b2f64..c69b9bd8de7 100644 --- a/app/services/labels/create_service.rb +++ b/app/services/labels/create_service.rb @@ -13,9 +13,7 @@ module Labels project_or_group = target_params[:project] || target_params[:group] if project_or_group.present? - if Feature.disabled?(:enforce_locked_labels_on_merge, project_or_group, type: :ops) - params.delete(:lock_on_merge) - end + params.delete(:lock_on_merge) unless project_or_group.supports_lock_on_merge? project_or_group.labels.create(params) elsif target_params[:template] |