Simplify label helper and correct version

lib/api/group_labels.rb

@@ -2,8 +2,8 @@
 
 module API
   class GroupLabels < Grape::API
-    include ::API::Helpers::LabelHelpers
     include PaginationParams
+    helpers ::API::Helpers::LabelHelpers
 
     before { authenticate! }
 
@@ -12,7 +12,7 @@ module API
     end
     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.7'
+        detail 'This feature was added in GitLab 11.8'
         success Entities::GroupLabel
       end
       params do
@@ -23,7 +23,7 @@ module API
       end
 
       desc 'Create a new label' do
-        detail 'This feature was added in GitLab 11.7'
+        detail 'This feature was added in GitLab 11.8'
         success Entities::GroupLabel
       end
       params do
@@ -34,7 +34,7 @@ module API
       end
 
       desc 'Update an existing label. At least one optional parameter is required.' do
-        detail 'This feature was added in GitLab 11.7'
+        detail 'This feature was added in GitLab 11.8'
         success Entities::GroupLabel
       end
       params do
@@ -49,7 +49,7 @@ module API
       end
 
       desc 'Delete an existing label' do
-        detail 'This feature was added in GitLab 11.7'
+        detail 'This feature was added in GitLab 11.8'
         success Entities::GroupLabel
       end
       params do

lib/api/helpers/label_helpers.rb

@@ -3,24 +3,14 @@
 module API
   module Helpers
     module LabelHelpers
-      extend ActiveSupport::Concern
+      extend Grape::API::Helpers
 
-      included do
-        helpers do
       params :label_create_params do
         requires :name, type: String, desc: 'The name of the label to be created'
         requires :color, type: String, desc: "The color of the label given in 6-digit hex notation with leading '#' sign (e.g. #FFAABB) or one of the allowed CSS color names"
         optional :description, type: String, desc: 'The description of label to be created'
       end
 
-          params :label_update_params do
-            requires :name,  type: String, desc: 'The name of the label to be updated'
-            optional :new_name, type: String, desc: 'The new name of the label'
-            optional :color, type: String, desc: "The new color of the label given in 6-digit hex notation with leading '#' sign (e.g. #FFAABB) or one of the allowed CSS color names"
-            optional :description, type: String, desc: 'The new description of label'
-            at_least_one_of :new_name, :color, :description
-          end
-
       def find_label(parent, id, include_ancestor_groups: true)
         labels = available_labels_for(parent, include_ancestor_groups: include_ancestor_groups)
         label = labels.find_by_id(id) || labels.find_by_title(id)
@@ -89,6 +79,4 @@ module API
       end
     end
   end
-    end
-  end
 end

lib/api/labels.rb

@@ -2,8 +2,8 @@
 
 module API
   class Labels < Grape::API
-    include ::API::Helpers::LabelHelpers
     include PaginationParams
+    helpers ::API::Helpers::LabelHelpers
 
     before { authenticate! }
 

lib/api/subscriptions.rb

@@ -2,7 +2,7 @@
 
 module API
   class Subscriptions < Grape::API
-    include ::API::Helpers::LabelHelpers
+    helpers ::API::Helpers::LabelHelpers
 
     before { authenticate! }