summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Kalderimis <alex.kalderimis@gmail.com>2019-05-23 15:40:08 -0400
committerAlex Kalderimis <alex.kalderimis@gmail.com>2019-05-24 15:13:13 -0400
commite252d6f4eb1111833dec31c00175cc7b6423bc19 (patch)
treee56b66b2f20c38092a2dd37fcd9ef28c294b79b0
parent5491b1b92f96662f99c8b87c730d3bb9ca847507 (diff)
downloadgitlab-ce-e252d6f4eb1111833dec31c00175cc7b6423bc19.tar.gz
Deal with spurious false-positive in code-reuse
-rw-r--r--.rubocop.yml2
-rw-r--r--lib/api/helpers/internal_helpers.rb2
2 files changed, 3 insertions, 1 deletions
diff --git a/.rubocop.yml b/.rubocop.yml
index 461c9eaad33..072413bfaa3 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -217,3 +217,5 @@ ActiveRecordAssociationReload:
# IgnoredMethods: respond_to, define_method
Style/SymbolProc:
Enabled: true
+ IgnoredMethods:
+ - tap # see: https://github.com/rubocop-hq/rubocop/issues/5098
diff --git a/lib/api/helpers/internal_helpers.rb b/lib/api/helpers/internal_helpers.rb
index f621aa53244..4fe0d918d0c 100644
--- a/lib/api/helpers/internal_helpers.rb
+++ b/lib/api/helpers/internal_helpers.rb
@@ -68,7 +68,7 @@ module API
end
def redis_ping
- result = Gitlab::Redis::SharedState.with(&:ping)
+ result = Gitlab::Redis::SharedState.with(&:ping) # rubocop:disable CodeReuse/ActiveRecord (SharedState is not an AR model)
result == 'PONG'
rescue => e