diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2019-02-19 11:25:50 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-02-19 11:25:50 +0000 |
| commit | 197641c7d7278a7a8c17e318b08dec876636110a (patch) | |
| tree | cfc223ab29ec3063e34133126aa3d101c1aef156 | |
| parent | 9b581d41663b4115f150263772bcbe1a3704d244 (diff) | |
| parent | 0e07a5aaa5d715e16f5af72f7d93a0597d66ff43 (diff) | |
| download | gitlab-ce-197641c7d7278a7a8c17e318b08dec876636110a.tar.gz | |
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
| -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 |