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

diff --git a/lib/api/snippets.rb b/lib/api/snippets.rb
index b30305b4bc9..6352a9c8742 100644
--- a/lib/api/snippets.rb
+++ b/lib/api/snippets.rb
@@ -92,6 +92,7 @@ module API
                               desc: 'The visibility of the snippet'
         at_least_one_of :title, :file_name, :content, :visibility
       end
+      # rubocop: disable CodeReuse/ActiveRecord
       put ':id' do
         snippet = snippets_for_current_user.find_by(id: params.delete(:id))
         break not_found!('Snippet') unless snippet
@@ -110,6 +111,7 @@ module API
           render_validation_error!(snippet)
         end
       end
+      # rubocop: enable CodeReuse/ActiveRecord
 
       desc 'Remove snippet' do
         detail 'This feature was introduced in GitLab 8.15.'
@@ -118,6 +120,7 @@ module API
       params do
         requires :id, type: Integer, desc: 'The ID of a snippet'
       end
+      # rubocop: disable CodeReuse/ActiveRecord
       delete ':id' do
         snippet = snippets_for_current_user.find_by(id: params.delete(:id))
         break not_found!('Snippet') unless snippet
@@ -126,6 +129,7 @@ module API
 
         destroy_conditionally!(snippet)
       end
+      # rubocop: enable CodeReuse/ActiveRecord
 
       desc 'Get a raw snippet' do
         detail 'This feature was introduced in GitLab 8.15.'
@@ -133,6 +137,7 @@ module API
       params do
         requires :id, type: Integer, desc: 'The ID of a snippet'
       end
+      # rubocop: disable CodeReuse/ActiveRecord
       get ":id/raw" do
         snippet = snippets_for_current_user.find_by(id: params.delete(:id))
         break not_found!('Snippet') unless snippet
@@ -141,6 +146,7 @@ module API
         content_type 'text/plain'
         present snippet.content
       end
+      # rubocop: enable CodeReuse/ActiveRecord
 
       desc 'Get the user agent details for a snippet' do
         success Entities::UserAgentDetail
@@ -148,6 +154,7 @@ module API
       params do
         requires :id, type: Integer, desc: 'The ID of a snippet'
       end
+      # rubocop: disable CodeReuse/ActiveRecord
       get ":id/user_agent_detail" do
         authenticated_as_admin!
 
@@ -157,6 +164,7 @@ module API
 
         present snippet.user_agent_detail, with: Entities::UserAgentDetail
       end
+      # rubocop: enable CodeReuse/ActiveRecord
     end
   end
 end