diff options
author | Mike Greiling <mike@pixelcog.com> | 2018-06-29 23:41:02 +0300 |
---|---|---|
committer | Mike Greiling <mike@pixelcog.com> | 2018-06-29 23:41:02 +0300 |
commit | e325367a85ca10ba5d4f28d6ff1005d8af3e5bb6 (patch) | |
tree | aaa40ce630ce2fd2c9ba625081d0d0a61e9a0452 | |
parent | 83ea3d68a817930d1097a4fd337f4d86369ba4d8 (diff) | |
parent | 52d578229a64cb8a6eedbfb35e77e8d5c6d68ac0 (diff) |
Merge branch 'include-all-axios-requests-in-performance-bar' into 'master'
Start performance bar eagerly
See merge request gitlab-org/gitlab-ce!20201
-rw-r--r-- | app/assets/javascripts/dispatcher.js | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js index b755458aa4b..a5af37e80b6 100644 --- a/app/assets/javascripts/dispatcher.js +++ b/app/assets/javascripts/dispatcher.js @@ -1,12 +1,12 @@ /* eslint-disable consistent-return, no-new */ import $ from 'jquery'; -import Flash from './flash'; import GfmAutoComplete from './gfm_auto_complete'; import { convertPermissionToBoolean } from './lib/utils/common_utils'; import GlFieldErrors from './gl_field_errors'; import Shortcuts from './shortcuts'; import SearchAutocomplete from './search_autocomplete'; +import performanceBar from './performance_bar'; function initSearch() { // Only when search form is present @@ -72,9 +72,7 @@ function initGFMInput() { function initPerformanceBar() { if (document.querySelector('#js-peek')) { - import('./performance_bar') - .then(m => new m.default({ container: '#js-peek' })) // eslint-disable-line new-cap - .catch(() => Flash('Error loading performance bar module')); + performanceBar({ container: '#js-peek' }); } } |