Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-10-12 09:08:53 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-10-12 09:08:53 +0300
commita1e664d4cc1edc8e5d6bd4a838e5e6a7426cc0f6 (patch)
tree4d687e4149c7cbd2b3d01cdca370bd6aa9c7549f /lib/gitlab/metrics
parentdb4ee69eb3df58ac9f109d64228d1468e4ff7962 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/metrics')
-rw-r--r--lib/gitlab/metrics/subscribers/active_record.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/metrics/subscribers/active_record.rb b/lib/gitlab/metrics/subscribers/active_record.rb
index e53ac00e77f..f9ba0a69b0e 100644
--- a/lib/gitlab/metrics/subscribers/active_record.rb
+++ b/lib/gitlab/metrics/subscribers/active_record.rb
@@ -61,7 +61,7 @@ module Gitlab
end
def current_transaction
- Transaction.current
+ ::Gitlab::Metrics::Transaction.current
end
end
end