diff options
Diffstat (limited to 'app/controllers/groups/labels_controller.rb')
| -rw-r--r-- | app/controllers/groups/labels_controller.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/controllers/groups/labels_controller.rb b/app/controllers/groups/labels_controller.rb index f927cae90b1..9535b83e769 100644 --- a/app/controllers/groups/labels_controller.rb +++ b/app/controllers/groups/labels_controller.rb @@ -98,7 +98,10 @@ class Groups::LabelsController < Groups::ApplicationController end def label_params - params.require(:label).permit(:title, :description, :color) + allowed = [:title, :description, :color] + allowed << :lock_on_merge if @group.supports_lock_on_merge? + + params.require(:label).permit(allowed) end def redirect_back_or_group_labels_path(options = {}) |