diff options
Diffstat (limited to 'app/services/labels/create_service.rb')
-rw-r--r-- | app/services/labels/create_service.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/services/labels/create_service.rb b/app/services/labels/create_service.rb index 6c070d15cdb..675439b2f64 100644 --- a/app/services/labels/create_service.rb +++ b/app/services/labels/create_service.rb @@ -13,6 +13,10 @@ 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 + project_or_group.labels.create(params) elsif target_params[:template] label = Label.new(params) |