From 6383a986de2cd5f64772b2bbd31ec635aadfda7b Mon Sep 17 00:00:00 2001 From: Robert Schilling Date: Tue, 25 Dec 2018 23:18:39 +0100 Subject: [PATCH] fix rebasing --- lib/api/group_labels.rb | 2 +- lib/api/subscriptions.rb | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/lib/api/group_labels.rb b/lib/api/group_labels.rb index d8be226f045..59ba93758a2 100644 --- a/lib/api/group_labels.rb +++ b/lib/api/group_labels.rb @@ -9,7 +9,7 @@ module API params do requires :id, type: String, desc: 'The ID of a group' end - resource :groups, requirements: API::PROJECT_ENDPOINT_REQUIREMENTS do + resource :groups, requirements: API::NAMESPACE_OR_PROJECT_REQUIREMENTS do desc 'Get all labels of the group' do detail 'This feature was added in GitLab 11.3' success Entities::Label diff --git a/lib/api/subscriptions.rb b/lib/api/subscriptions.rb index 58c9dfcc1db..ed9e1a015f1 100644 --- a/lib/api/subscriptions.rb +++ b/lib/api/subscriptions.rb @@ -11,15 +11,6 @@ module API { type: 'labels', source: Group, finder: ->(id) { find_label(user_group, id) }, parent_resource: -> { nil } } ] - params do - requires :id, type: String, desc: 'The ID of a project' - requires :subscribable_id, type: String, desc: 'The ID of a resource' - end - resource :projects, requirements: API::NAMESPACE_OR_PROJECT_REQUIREMENTS do - subscribable_types.each do |type, finder| - type_singularized = type.singularize - entity_class = Entities.const_get(type_singularized.camelcase) - subscribables.each do |subscribable| source_type = subscribable[:source].name.underscore entity_class = Entities.const_get(subscribable[:type].singularize.camelcase)