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, 4 insertions, 0 deletions

diff --git a/lib/api/projects.rb b/lib/api/projects.rb
index 2801ae918c6..ee426f39523 100644
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
@@ -198,6 +198,7 @@ module API
         use :optional_project_params
         use :create_params
       end
+      # rubocop: disable CodeReuse/ActiveRecord
       post "user/:user_id" do
         authenticated_as_admin!
         user = User.find_by(id: params.delete(:user_id))
@@ -214,6 +215,7 @@ module API
           render_validation_error!(project)
         end
       end
+      # rubocop: enable CodeReuse/ActiveRecord
     end
 
     params do
@@ -444,6 +446,7 @@ module API
       params do
         requires :group_id, type: Integer, desc: 'The ID of the group'
       end
+      # rubocop: disable CodeReuse/ActiveRecord
       delete ":id/share/:group_id" do
         authorize! :admin_project, user_project
 
@@ -452,6 +455,7 @@ module API
 
         destroy_conditionally!(link)
       end
+      # rubocop: enable CodeReuse/ActiveRecord
 
       desc 'Upload a file'
       params do