Merge branch 'rubocop-code-reuse' into 'master'

Add RuboCop cops to enforce code reusing rules

See merge request gitlab-org/gitlab-ce!21391

3 files changed, 10 insertions, 0 deletions

diff --git a/lib/api/helpers/custom_attributes.rb b/lib/api/helpers/custom_attributes.rb
index 10d652e33f5..3bbe827967e 100644
--- a/lib/api/helpers/custom_attributes.rb
+++ b/lib/api/helpers/custom_attributes.rb
@@ -12,6 +12,7 @@ module API
                                          desc: 'Filter with custom attributes'
           end
 
+          # rubocop: disable CodeReuse/ActiveRecord
           def with_custom_attributes(collection_or_resource, options = {})
             options = options.merge(
               with_custom_attributes: params[:with_custom_attributes] &&
@@ -24,6 +25,7 @@ module API
 
             [collection_or_resource, options]
           end
+          # rubocop: enable CodeReuse/ActiveRecord
         end
       end
     end
diff --git a/lib/api/helpers/members_helpers.rb b/lib/api/helpers/members_helpers.rb
index fed8846e505..518aaa62aef 100644
--- a/lib/api/helpers/members_helpers.rb
+++ b/lib/api/helpers/members_helpers.rb
@@ -17,6 +17,7 @@ module API
           .non_request
       end
 
+      # rubocop: disable CodeReuse/ActiveRecord
       def find_all_members_for_project(project)
         shared_group_ids = project.project_group_links.pluck(:group_id)
         project_group_ids = project.group&.self_and_ancestors&.pluck(:id)
@@ -28,13 +29,16 @@ module API
           .where(project_authorizations: { project_id: project.id })
           .where(source_id: source_ids)
       end
+      # rubocop: enable CodeReuse/ActiveRecord
 
+      # rubocop: disable CodeReuse/ActiveRecord
       def find_all_members_for_group(group)
         source_ids = group.self_and_ancestors.pluck(:id)
         Member.includes(:user)
           .where(source_id: source_ids)
           .where(source_type: 'Namespace')
       end
+      # rubocop: enable CodeReuse/ActiveRecord
     end
   end
 end
diff --git a/lib/api/helpers/pagination.rb b/lib/api/helpers/pagination.rb
index 3308212216e..50bcd4e0437 100644
--- a/lib/api/helpers/pagination.rb
+++ b/lib/api/helpers/pagination.rb
@@ -91,6 +91,7 @@ module API
           @request_context = request_context
         end
 
+        # rubocop: disable CodeReuse/ActiveRecord
         def paginate(relation)
           pagination = KeysetPaginationInfo.new(relation, request_context)
 
@@ -112,6 +113,7 @@ module API
 
           paged_relation
         end
+        # rubocop: enable CodeReuse/ActiveRecord
 
         private
 
@@ -183,6 +185,7 @@ module API
 
         private
 
+        # rubocop: disable CodeReuse/ActiveRecord
         def add_default_order(relation)
           if relation.is_a?(ActiveRecord::Relation) && relation.order_values.empty?
             relation = relation.order(:id)
@@ -190,6 +193,7 @@ module API
 
           relation
         end
+        # rubocop: enable CodeReuse/ActiveRecord
 
         def add_pagination_headers(paginated_data)
           header 'X-Per-Page',    paginated_data.limit_value.to_s