summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-10-23 10:17:49 +0000
committerRémy Coutable <remy@rymai.me>2017-10-23 10:17:49 +0000
commit3f9022cf78a6e8fce1781d53e86e4955bd88c3c6 (patch)
tree2165bafc5513a9749d738fa2a9eb5052af4af969 /app
parent5295f23b4bf1b13c9395c1871edce0095cb852cc (diff)
parent5e2a748bb71f09cd662f10e5b3de6155c9c742ac (diff)
downloadgitlab-ce-3f9022cf78a6e8fce1781d53e86e4955bd88c3c6.tar.gz
Merge branch 'zj-peek-gitaly' into 'master'
Show Gitaly data in the peek performance bar Closes #39231 See merge request gitlab-org/gitlab-ce!14949
Diffstat (limited to 'app')
-rw-r--r--app/views/peek/views/_gitaly.html.haml7
1 files changed, 7 insertions, 0 deletions
diff --git a/app/views/peek/views/_gitaly.html.haml b/app/views/peek/views/_gitaly.html.haml
new file mode 100644
index 00000000000..a7d040d6821
--- /dev/null
+++ b/app/views/peek/views/_gitaly.html.haml
@@ -0,0 +1,7 @@
+- local_assigns.fetch(:view)
+
+%strong
+ %span{ data: { defer_to: "#{view.defer_key}-duration" } } ...
+ \/
+ %span{ data: { defer_to: "#{view.defer_key}-calls" } } ...
+ Gitaly