diff options
| author | Nick Thomas <nick@gitlab.com> | 2016-09-22 19:07:57 +0300 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2016-09-23 14:21:47 +0300 |
| commit | af5e54f9ce4f491ccf605c7c74c137785da743a4 (patch) | |
| tree | e26eed9d37826f7207e43b388a159d410134ce97 /app/controllers/projects/labels_controller.rb | |
| parent | fd51f19c978023160ad759676a0363c12aea3fc8 (diff) | |
Convert label creation from API to controller endpoint
Diffstat (limited to 'app/controllers/projects/labels_controller.rb')
| -rw-r--r-- | app/controllers/projects/labels_controller.rb | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/app/controllers/projects/labels_controller.rb b/app/controllers/projects/labels_controller.rb index 28fa4a5b141..a6626df4826 100644 --- a/app/controllers/projects/labels_controller.rb +++ b/app/controllers/projects/labels_controller.rb @@ -30,9 +30,15 @@ class Projects::LabelsController < Projects::ApplicationController @label = @project.labels.create(label_params) if @label.valid? - redirect_to namespace_project_labels_path(@project.namespace, @project) + respond_to do |format| + format.html { redirect_to namespace_project_labels_path(@project.namespace, @project) } + format.json { render json: @label } + end else - render 'new' + respond_to do |format| + format.html { render 'new' } + format.json { render json: { message: @label.errors.messages }, status: 400 } + end end end |