Automatic merge of gitlab-org/gitlab-ce master

86c8231b · GitLab Bot · 544397b8 · 0841f052 · 86c8231b
Commit 86c8231b authored Feb 10, 2019 by GitLab Bot
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

config/initializers/zz_metrics.rb config/initializers/zz_metrics.rb +1 -1

No files found.
--- a/config/initializers/zz_metrics.rb
+++ b/config/initializers/zz_metrics.rb
@@ -202,7 +202,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