BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
5d8726bb
Commit
5d8726bb
authored
Aug 01, 2016
by
Yorick Peterse
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '20473-rails-queue-duration' into 'master'
Gitlab::Metrics.current_transaction needs to be public for RailsQueueDuration See merge request !5592
parents
74d4f3de
2dcfaa19
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
CHANGELOG
CHANGELOG
+1
-0
metrics.rb
lib/gitlab/metrics.rb
+1
-2
No files found.
CHANGELOG
View file @
5d8726bb
...
...
@@ -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)
...
...
lib/gitlab/metrics.rb
View file @
5d8726bb
...
...
@@ -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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment