Merge branch 'master' into 'maintainers-can-create-subgroup'

# Conflicts:
#   doc/user/permissions.md

1 files changed, 3 insertions, 1 deletions

diff --git a/lib/gitlab/reference_counter.rb b/lib/gitlab/reference_counter.rb
index d2dbc6f5ef5..1c43de35816 100644
--- a/lib/gitlab/reference_counter.rb
+++ b/lib/gitlab/reference_counter.rb
@@ -22,6 +22,7 @@ module Gitlab
       end
     end
 
+    # rubocop:disable Gitlab/RailsLogger
     def decrease
       redis_cmd do |redis|
         current_value = redis.decr(key)
@@ -32,6 +33,7 @@ module Gitlab
         end
       end
     end
+    # rubocop:enable Gitlab/RailsLogger
 
     private
 
@@ -39,7 +41,7 @@ module Gitlab
       Gitlab::Redis::SharedState.with { |redis| yield(redis) }
       true
     rescue => e
-      Rails.logger.warn("GitLab: An unexpected error occurred in writing to Redis: #{e}")
+      Rails.logger.warn("GitLab: An unexpected error occurred in writing to Redis: #{e}") # rubocop:disable Gitlab/RailsLogger
       false
     end
   end