Merge branch 'pl-copy-still-active' into 'master'

Fix error when reloading code in Sidekiq

Closes #54320

See merge request gitlab-org/gitlab-ce!25069
This commit is contained in:
Stan Hu 2019-02-10 12:14:29 +00:00
commit 0841f052e6
1 changed files with 1 additions and 1 deletions

View File

@ -173,7 +173,7 @@ if Gitlab::Metrics.enabled? && !Rails.env.test? && !(Rails.env.development? && d
def connect(*args)
val = super
if current_transaction = Gitlab::Metrics::Transaction.current
if current_transaction = ::Gitlab::Metrics::Transaction.current
current_transaction.increment(:new_redis_connections, 1)
end