summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaco Guzman <pacoguzmanp@gmail.com>2016-08-01 14:08:43 +0200
committerPaco Guzman <pacoguzmanp@gmail.com>2016-08-01 14:13:04 +0200
commit2dcfaa19833256f7638153a499ed907f86949dd6 (patch)
tree6395c796940adba1e883b5538cb5b0bffaa73e2f
parente570b823c17ad405914b7b37e4df85c21edda2d1 (diff)
downloadgitlab-ce-2dcfaa19833256f7638153a499ed907f86949dd6.tar.gz
Gitlab::Metrics.current_transaction needs to be public for RailsQueueDuration
-rw-r--r--CHANGELOG1
-rw-r--r--lib/gitlab/metrics.rb3
2 files changed, 2 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index c9658e4ba5c..f3245f8799f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -30,6 +30,7 @@ v 8.11.0 (unreleased)
- Make branches sortable without push permission !5462 (winniehell)
- Check for Ci::Build artifacts at database level on pipeline partial
- Make "New issue" button in Issue page less obtrusive !5457 (winniehell)
+ - Gitlab::Metrics.current_transaction needs to be public for RailsQueueDuration
- Add GitLab Workhorse version to admin dashboard (Katarzyna Kobierska Ula Budziszewska)
- Add the `sprockets-es6` gem
- Multiple trigger variables show in separate lines (Katarzyna Kobierska Ula Budziszewska)
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