diff options
| author | Dongqing Hu <sorra@outlook.com> | 2017-03-29 11:45:15 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-03-29 11:45:15 +0000 |
| commit | 6dd76954443180e8fe97950e230ea6d1e2400d65 (patch) | |
| tree | a3ada4ea616e2aaabed3a25a9960f19bd59b99e3 /app/controllers/projects/labels_controller.rb | |
| parent | b0e18eaf87e446caa075ba56c0e805b514206e10 (diff) | |
| download | gitlab-ce-6dd76954443180e8fe97950e230ea6d1e2400d65.tar.gz | |
Labels support color names in backend
Diffstat (limited to 'app/controllers/projects/labels_controller.rb')
| -rw-r--r-- | app/controllers/projects/labels_controller.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/controllers/projects/labels_controller.rb b/app/controllers/projects/labels_controller.rb index 1593b5c1afb..2f55ba4e700 100644 --- a/app/controllers/projects/labels_controller.rb +++ b/app/controllers/projects/labels_controller.rb @@ -29,7 +29,7 @@ class Projects::LabelsController < Projects::ApplicationController end def create - @label = @project.labels.create(label_params) + @label = Labels::CreateService.new(label_params).execute(project: @project) if @label.valid? respond_to do |format| @@ -48,7 +48,9 @@ class Projects::LabelsController < Projects::ApplicationController end def update - if @label.update_attributes(label_params) + @label = Labels::UpdateService.new(label_params).execute(@label) + + if @label.valid? redirect_to namespace_project_labels_path(@project.namespace, @project) else render :edit |