diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2019-02-19 14:25:50 +0300 |
---|---|---|
committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-02-19 15:53:54 +0300 |
commit | 7e2d47b2113b2431ef246be3799eb50685b207b3 (patch) | |
tree | 33fb9422a9fd704c8a5c89d5b13199908cb956d5 /app | |
parent | 1e060e2ad3bf8dc1cbec3bba8ab310c9715b046a (diff) |
Merge branch 'fix-performance-bar-not-tracking-some-requests' into 'master'
Fixes some requests not being tracked in performance bar
Closes #57886
See merge request gitlab-org/gitlab-ce!25384
(cherry picked from commit 197641c7d7278a7a8c17e318b08dec876636110a)
0e07a5aa Fixes some requests not being tracked in performance bar
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/main.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js index 63db4938cd7..1b722c0505a 100644 --- a/app/assets/javascripts/main.js +++ b/app/assets/javascripts/main.js @@ -78,7 +78,6 @@ function deferredInitialisation() { initUserPopovers(); if (document.querySelector('.search')) initSearchAutocomplete(); - if (document.querySelector('#js-peek')) initPerformanceBar({ container: '#js-peek' }); addSelectOnFocusBehaviour('.js-select-on-focus'); @@ -145,6 +144,8 @@ document.addEventListener('DOMContentLoaded', () => { const $sidebarGutterToggle = $('.js-sidebar-toggle'); let bootstrapBreakpoint = bp.getBreakpointSize(); + if (document.querySelector('#js-peek')) initPerformanceBar({ container: '#js-peek' }); + initLayoutNav(); // Set the default path for all cookies to GitLab's root directory |