diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-18 23:02:30 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-18 23:02:30 +0300 |
| commit | 41fe97390ceddf945f3d967b8fdb3de4c66b7dea (patch) | |
| tree | 9c8d89a8624828992f06d892cd2f43818ff5dcc8 /lib/peek | |
| parent | 0804d2dc31052fb45a1efecedc8e06ce9bc32862 (diff) | |
Add latest changes from gitlab-org/gitlab@14-9-stable-eev14.9.0-rc42
Diffstat (limited to 'lib/peek')
| -rw-r--r-- | lib/peek/views/active_record.rb | 8 | ||||
| -rw-r--r-- | lib/peek/views/detailed_view.rb | 2 |
2 files changed, 1 insertions, 9 deletions
diff --git a/lib/peek/views/active_record.rb b/lib/peek/views/active_record.rb index 6a41de8f0b0..75346626255 100644 --- a/lib/peek/views/active_record.rb +++ b/lib/peek/views/active_record.rb @@ -75,14 +75,6 @@ module Peek "Role: #{role.to_s.capitalize}" end - - def format_call_details(call) - if ENV['GITLAB_MULTIPLE_DATABASE_METRICS'] - super - else - super.except(:db_config_name) - end - end end end end diff --git a/lib/peek/views/detailed_view.rb b/lib/peek/views/detailed_view.rb index 4cc2e85c7bb..1301c6aa6fd 100644 --- a/lib/peek/views/detailed_view.rb +++ b/lib/peek/views/detailed_view.rb @@ -23,7 +23,7 @@ module Peek private def duration - detail_store.map { |entry| entry[:duration] }.sum * 1000 + detail_store.sum { |entry| entry[:duration] } * 1000 end def calls |