diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-18 03:08:53 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-18 03:08:53 +0300 |
| commit | 9214cac69b0f0306a86056720cfc62b738449c19 (patch) | |
| tree | 79c6fdbc2c8b379dd908294faa54c3fa2ab97551 /app/controllers/projects | |
| parent | 13d851c795a48b670b859a7ec5bd6e2886d2789e (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/projects')
| -rw-r--r-- | app/controllers/projects/labels_controller.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/controllers/projects/labels_controller.rb b/app/controllers/projects/labels_controller.rb index 67cff16a76b..5466f03f3b4 100644 --- a/app/controllers/projects/labels_controller.rb +++ b/app/controllers/projects/labels_controller.rb @@ -155,7 +155,10 @@ class Projects::LabelsController < Projects::ApplicationController protected def label_params - params.require(:label).permit(:title, :description, :color) + allowed = [:title, :description, :color] + allowed << :lock_on_merge if Feature.enabled?(:enforce_locked_labels_on_merge, @project, type: :ops) + + params.require(:label).permit(allowed) end def label |