diff options
author | Robert Schilling <rschilling@student.tugraz.at> | 2019-01-06 18:56:02 +0100 |
---|---|---|
committer | Robert Schilling <rschilling@student.tugraz.at> | 2019-01-31 13:49:51 +0100 |
commit | a9fdc3118a7f9fb55b6f6b243f7bed2abe1ce48f (patch) | |
tree | 92dace891ba5dd38a0d979c8146bd61d32d71fe9 /lib/api/group_labels.rb | |
parent | 4e9aa7e2c042030cea190a1e57dee76de0e573ea (diff) | |
download | gitlab-ce-a9fdc3118a7f9fb55b6f6b243f7bed2abe1ce48f.tar.gz |
Incorporate feedback from Robert
Diffstat (limited to 'lib/api/group_labels.rb')
-rw-r--r-- | lib/api/group_labels.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/group_labels.rb b/lib/api/group_labels.rb index 85fd470c10d..559e6a25f35 100644 --- a/lib/api/group_labels.rb +++ b/lib/api/group_labels.rb @@ -57,7 +57,7 @@ module API delete ':id/labels' do authorize! :admin_label, user_group - label = find_label(user_group, params[:name], false) + label = find_label(user_group, params[:name], include_ancestor_groups: false) destroy_conditionally!(label) end @@ -76,7 +76,7 @@ module API put ':id/labels' do authorize! :admin_label, user_group - label = find_label(user_group, params[:name], false) + label = find_label(user_group, params[:name], include_ancestor_groups: false) label = ::Labels::UpdateService.new(declared_params(include_missing: false)).execute(label) render_validation_error!(label) unless label.valid? |