Merge remote-tracking branch 'origin/master' into ce-6983-promote-starting-a-gitlab-com-trial

1 files changed, 8 insertions, 0 deletions

diff --git a/app/models/key.rb b/app/models/key.rb
index 3bb0d2f6f9c..bdb83e12793 100644
--- a/app/models/key.rb
+++ b/app/models/key.rb
@@ -55,9 +55,11 @@ class Key < ActiveRecord::Base
     "key-#{id}"
   end
 
+  # rubocop: disable CodeReuse/ServiceClass
   def update_last_used_at
     Keys::LastUsedService.new(self).execute
   end
+  # rubocop: enable CodeReuse/ServiceClass
 
   def add_to_shell
     GitlabShellWorker.perform_async(
@@ -67,9 +69,11 @@ class Key < ActiveRecord::Base
     )
   end
 
+  # rubocop: disable CodeReuse/ServiceClass
   def post_create_hook
     SystemHooksService.new.execute_hooks_for(self, :create)
   end
+  # rubocop: enable CodeReuse/ServiceClass
 
   def remove_from_shell
     GitlabShellWorker.perform_async(
@@ -79,15 +83,19 @@ class Key < ActiveRecord::Base
     )
   end
 
+  # rubocop: disable CodeReuse/ServiceClass
   def refresh_user_cache
     return unless user
 
     Users::KeysCountService.new(user).refresh_cache
   end
+  # rubocop: enable CodeReuse/ServiceClass
 
+  # rubocop: disable CodeReuse/ServiceClass
   def post_destroy_hook
     SystemHooksService.new.execute_hooks_for(self, :destroy)
   end
+  # rubocop: enable CodeReuse/ServiceClass
 
   def public_key
     @public_key ||= Gitlab::SSHPublicKey.new(key)