diff options
author | Yorick Peterse <yorickpeterse@gmail.com> | 2016-08-01 13:00:19 +0000 |
---|---|---|
committer | Yorick Peterse <yorickpeterse@gmail.com> | 2016-08-01 13:00:19 +0000 |
commit | 5d8726bb68a3f0a2aebf35339343706ede8f835b (patch) | |
tree | 41559b918fe527166e1f77872603bec3b510b9e6 /lib | |
parent | 74d4f3deb8360f16af83ee596bbbcadaa39e7a05 (diff) | |
parent | 2dcfaa19833256f7638153a499ed907f86949dd6 (diff) | |
download | gitlab-ce-5d8726bb68a3f0a2aebf35339343706ede8f835b.tar.gz |
Merge branch '20473-rails-queue-duration' into 'master'
Gitlab::Metrics.current_transaction needs to be public for RailsQueueDuration
See merge request !5592
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/metrics.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/gitlab/metrics.rb b/lib/gitlab/metrics.rb index 081576a440c..41fcd971c22 100644 --- a/lib/gitlab/metrics.rb +++ b/lib/gitlab/metrics.rb @@ -141,10 +141,9 @@ module Gitlab end end + # Allow access from other metrics related middlewares def self.current_transaction Transaction.current end - - private_class_method :current_transaction end end |