diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-02-24 14:06:55 -0500 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-02-24 14:06:55 -0500 |
| commit | a4e522a889b24d7d7768ac3b77d0b544a25c3782 (patch) | |
| tree | 5133df88a0bf7d5cdb8aeef7acd6232f9d6aadcb /app/controllers/projects/labels_controller.rb | |
| parent | 9f0a71f4fe0eade788c1c722c70873b319492dbe (diff) | |
| parent | 4a9affa7330f2099f6385d3d74150f93cfd008f1 (diff) | |
| download | gitlab-ce-a4e522a889b24d7d7768ac3b77d0b544a25c3782.tar.gz | |
Merge branch 'master' into minimize-on-diff
Diffstat (limited to 'app/controllers/projects/labels_controller.rb')
| -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 86d6e3e0f6b..ecac3c395ec 100644 --- a/app/controllers/projects/labels_controller.rb +++ b/app/controllers/projects/labels_controller.rb @@ -69,7 +69,7 @@ class Projects::LabelsController < Projects::ApplicationController end def label_params - params.require(:label).permit(:title, :color) + params.require(:label).permit(:title, :description, :color) end def label |