summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorYorick Peterse <yorickpeterse@gmail.com>2015-11-25 11:29:48 +0000
committerYorick Peterse <yorickpeterse@gmail.com>2015-11-25 11:29:48 +0000
commitef2bc0f0bf206198a1f4097cc3a5d2fb47ceb007 (patch)
treeab0baca6ab80a7727547f651ba8475619ac46b7b /app
parent4cfc3df534c50957725f7e1f80c82f88fd764f70 (diff)
parent97f8c6279fc39c4bad87bb880eba04802f6d351d (diff)
downloadgitlab-ce-ef2bc0f0bf206198a1f4097cc3a5d2fb47ceb007.tar.gz
Merge branch 'sherlock-total-query-time' into 'master'
Added total query time to Sherlock This makes it easier to see if a problem is caused by slow queries or slow Ruby code (unrelated to any SQL queries that might be used). See merge request !1887
Diffstat (limited to 'app')
-rw-r--r--app/views/sherlock/transactions/_general.html.haml6
1 files changed, 6 insertions, 0 deletions
diff --git a/app/views/sherlock/transactions/_general.html.haml b/app/views/sherlock/transactions/_general.html.haml
index 4287a0c3203..8533b130da6 100644
--- a/app/views/sherlock/transactions/_general.html.haml
+++ b/app/views/sherlock/transactions/_general.html.haml
@@ -27,6 +27,12 @@
= t('sherlock.seconds')
%li
%span.light
+ #{t('sherlock.query_time')}
+ %strong
+ = @transaction.query_duration.round(2)
+ = t('sherlock.seconds')
+ %li
+ %span.light
#{t('sherlock.finished_at')}:
%strong
= time_ago_in_words(@transaction.finished_at)