diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-31 18:09:22 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-31 18:09:22 +0300 |
| commit | 532c924885ebec865e0c87f484eadaf2828910e2 (patch) | |
| tree | 66d3d85d30d02dfe3f559439ab5e2d6351a969ff /app/controllers/projects | |
| parent | a8632f50992a5304304e122fc7dfff1fd87b3c09 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/projects')
| -rw-r--r-- | app/controllers/projects/labels_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/labels_controller.rb b/app/controllers/projects/labels_controller.rb index 5466f03f3b4..e62f912e0f7 100644 --- a/app/controllers/projects/labels_controller.rb +++ b/app/controllers/projects/labels_controller.rb @@ -156,7 +156,7 @@ class Projects::LabelsController < Projects::ApplicationController def label_params allowed = [:title, :description, :color] - allowed << :lock_on_merge if Feature.enabled?(:enforce_locked_labels_on_merge, @project, type: :ops) + allowed << :lock_on_merge if @project.supports_lock_on_merge? params.require(:label).permit(allowed) end |