Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'lib/api/helpers/label_helpers.rb')
-rw-r--r--lib/api/helpers/label_helpers.rb14
1 files changed, 10 insertions, 4 deletions
diff --git a/lib/api/helpers/label_helpers.rb b/lib/api/helpers/label_helpers.rb
index 02613cbf9b9..8572cc89e71 100644
--- a/lib/api/helpers/label_helpers.rb
+++ b/lib/api/helpers/label_helpers.rb
@@ -82,8 +82,14 @@ module API
params.delete(:label_id)
params.delete(:name)
- label = ::Labels::UpdateService.new(declared_params(include_missing: false)).execute(label)
- render_validation_error!(label) unless label.valid?
+ update_params = declared_params(include_missing: false)
+
+ if update_params.present?
+ authorize! :admin_label, label
+
+ label = ::Labels::UpdateService.new(update_params).execute(label)
+ render_validation_error!(label) unless label.valid?
+ end
if parent.is_a?(Project) && update_priority
if priority.nil?
@@ -97,10 +103,10 @@ module API
end
def delete_label(parent)
- authorize! :admin_label, parent
-
label = find_label(parent, params_id_or_title, include_ancestor_groups: false)
+ authorize! :admin_label, label
+
destroy_conditionally!(label)
end