summaryrefslogtreecommitdiff
path: root/lib/api/group_labels.rb
diff options
context:
space:
mode:
authorRobert Schilling <rschilling@student.tugraz.at>2018-08-24 09:35:27 +0200
committerRobert Schilling <rschilling@student.tugraz.at>2019-01-31 13:49:49 +0100
commitf66fec1d41cda8da604a5a92ed811f2b6b80a9dc (patch)
treec9ccbcc926d34964ebd6a673ef2c6508d5a9f3fc /lib/api/group_labels.rb
parent3418697e90ad88abf7850bd7f6faf31dbf198658 (diff)
downloadgitlab-ce-f66fec1d41cda8da604a5a92ed811f2b6b80a9dc.tar.gz
Add specs
Diffstat (limited to 'lib/api/group_labels.rb')
-rw-r--r--lib/api/group_labels.rb16
1 files changed, 9 insertions, 7 deletions
diff --git a/lib/api/group_labels.rb b/lib/api/group_labels.rb
index b9bd3d7448c..8b502b047d3 100644
--- a/lib/api/group_labels.rb
+++ b/lib/api/group_labels.rb
@@ -15,7 +15,9 @@ module API
use :pagination
end
get ':id/labels' do
- present paginate(available_labels_for(user_group)), with: Entities::Label, current_user: current_user, project: user_project
+ group_labels = available_labels_for(user_group)
+
+ present paginate(group_labels), with: Entities::Label, current_user: current_user, parent: user_group
end
desc 'Create a new label' do
@@ -27,15 +29,15 @@ module API
optional :description, type: String, desc: 'The description of label to be created'
end
post ':id/labels' do
- authorize! :admin_label, user_project
+ authorize! :admin_label, user_group
label = available_labels_for(user_group).find_by(title: params[:name])
conflict!('Label already exists') if label
- label = ::Labels::CreateService.new(declared_params(include_missing: false)).execute(project: user_group)
+ label = ::Labels::CreateService.new(declared_params(include_missing: false)).execute(group: user_group)
if label.valid?
- present label, with: Entities::Label, current_user: current_user, project: user_project
+ present label, with: Entities::Label, current_user: current_user, parent: user_group
else
render_validation_error!(label)
end
@@ -48,7 +50,7 @@ module API
requires :name, type: String, desc: 'The name of the label to be deleted'
end
delete ':id/labels' do
- authorize! :admin_label, user_project
+ authorize! :admin_label, user_group
label = user_group.labels.find_by(title: params[:name])
not_found!('Label') unless label
@@ -67,7 +69,7 @@ module API
at_least_one_of :new_name, :color, :description
end
put ':id/labels' do
- authorize! :admin_label, user_project
+ authorize! :admin_label, user_group
label = user_group.labels.find_by(title: params[:name])
not_found!('Label not found') unless label
@@ -79,7 +81,7 @@ module API
label = ::Labels::UpdateService.new(label_params).execute(label)
render_validation_error!(label) unless label.valid?
- present label, with: Entities::Label, current_user: current_user, project: user_project
+ present label, with: Entities::Label, current_user: current_user, parent: user_group
end
end
end