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

Add RuboCop cops to enforce code reusing rules

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

1 files changed, 10 insertions, 0 deletions

diff --git a/lib/api/issues.rb b/lib/api/issues.rb
index cedfd2fbaa0..bcb03a0b540 100644
--- a/lib/api/issues.rb
+++ b/lib/api/issues.rb
@@ -7,6 +7,7 @@ module API
     helpers ::Gitlab::IssuableMetadata
 
     helpers do
+      # rubocop: disable CodeReuse/ActiveRecord
       def find_issues(args = {})
         args = declared_params.merge(args)
 
@@ -20,6 +21,7 @@ module API
 
         issues.reorder(args[:order_by] => args[:sort])
       end
+      # rubocop: enable CodeReuse/ActiveRecord
 
       params :issues_params do
         optional :labels, type: String, desc: 'Comma-separated list of label names'
@@ -207,6 +209,7 @@ module API
         at_least_one_of :title, :description, :assignee_ids, :assignee_id, :milestone_id, :discussion_locked,
                         :labels, :created_at, :due_date, :confidential, :state_event
       end
+      # rubocop: disable CodeReuse/ActiveRecord
       put ':id/issues/:issue_iid' do
         Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-ce/issues/42322')
 
@@ -234,6 +237,7 @@ module API
           render_validation_error!(issue)
         end
       end
+      # rubocop: enable CodeReuse/ActiveRecord
 
       desc 'Move an existing issue' do
         success Entities::Issue
@@ -242,6 +246,7 @@ module API
         requires :issue_iid, type: Integer, desc: 'The internal ID of a project issue'
         requires :to_project_id, type: Integer, desc: 'The ID of the new project'
       end
+      # rubocop: disable CodeReuse/ActiveRecord
       post ':id/issues/:issue_iid/move' do
         Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-ce/issues/42323')
 
@@ -258,11 +263,13 @@ module API
           render_api_error!(error.message, 400)
         end
       end
+      # rubocop: enable CodeReuse/ActiveRecord
 
       desc 'Delete a project issue'
       params do
         requires :issue_iid, type: Integer, desc: 'The internal ID of a project issue'
       end
+      # rubocop: disable CodeReuse/ActiveRecord
       delete ":id/issues/:issue_iid" do
         issue = user_project.issues.find_by(iid: params[:issue_iid])
         not_found!('Issue') unless issue
@@ -273,6 +280,7 @@ module API
           Issuable::DestroyService.new(user_project, current_user).execute(issue)
         end
       end
+      # rubocop: enable CodeReuse/ActiveRecord
 
       desc 'List merge requests closing issue'  do
         success Entities::MergeRequestBasic
@@ -280,6 +288,7 @@ module API
       params do
         requires :issue_iid, type: Integer, desc: 'The internal ID of a project issue'
       end
+      # rubocop: disable CodeReuse/ActiveRecord
       get ':id/issues/:issue_iid/closed_by' do
         issue = find_project_issue(params[:issue_iid])
 
@@ -288,6 +297,7 @@ module API
 
         present paginate(merge_requests), with: Entities::MergeRequestBasic, current_user: current_user, project: user_project
       end
+      # rubocop: enable CodeReuse/ActiveRecord
 
       desc 'List participants for an issue'  do
         success Entities::UserBasic