diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-09-02 11:43:21 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2019-09-02 11:43:21 +0300 |
| commit | b7398bc1fdad6c721cfa35ff17cebc2cb00c8240 (patch) | |
| tree | 48592d3a9f6d495b8b47b31c60dfa6eb17a00bb2 /app/views | |
| parent | d6de7c65500b73f2e7f899e0c0a224aafca3d4d1 (diff) | |
| parent | c2452db59cf045f01244b8d72e14cb0144d19722 (diff) | |
Merge branch 'fix-peek-on-puma' into 'master'
Fix Peek on Puma
Closes #66528
See merge request gitlab-org/gitlab-ce!32213
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/peek/_bar.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/peek/_bar.html.haml b/app/views/peek/_bar.html.haml index 5228930293c..9725f640be9 100644 --- a/app/views/peek/_bar.html.haml +++ b/app/views/peek/_bar.html.haml @@ -1,6 +1,6 @@ -- return unless peek_enabled? +- return unless performance_bar_enabled? #js-peek{ data: { env: Peek.env, - request_id: Peek.request_id, + request_id: peek_request_id, peek_url: "#{peek_routes_path}/results" }, class: Peek.env } |