diff options
Diffstat (limited to 'app/assets/javascripts/main.js')
| -rw-r--r-- | app/assets/javascripts/main.js | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js index 2309f7a420f..5c14000a2aa 100644 --- a/app/assets/javascripts/main.js +++ b/app/assets/javascripts/main.js @@ -31,7 +31,7 @@ import initFrequentItemDropdowns from './frequent_items'; import initBreadcrumbs from './breadcrumb'; import initPersistentUserCallouts from './persistent_user_callouts'; import { initUserTracking, initDefaultTrackers } from './tracking'; -import initUsagePingConsent from './usage_ping_consent'; +import initServicePingConsent from './service_ping_consent'; import GlFieldErrors from './gl_field_errors'; import initUserPopovers from './user_popovers'; import initBroadcastNotifications from './broadcast_notification'; @@ -46,6 +46,9 @@ applyGitLabUIConfig(); window.jQuery = jQuery; window.$ = jQuery; +// ensure that window.gl is set up +window.gl = window.gl || {}; + // inject test utilities if necessary if (process.env.NODE_ENV !== 'production' && gon?.test_env) { import(/* webpackMode: "eager" */ './test_utils/'); @@ -86,7 +89,7 @@ function deferredInitialisation() { initBreadcrumbs(); initTodoToggle(); initLogoAnimation(); - initUsagePingConsent(); + initServicePingConsent(); initUserPopovers(); initBroadcastNotifications(); initFrequentItemDropdowns(); @@ -183,7 +186,7 @@ document.addEventListener('DOMContentLoaded', () => { return true; }); - localTimeAgo($('abbr.timeago, .js-timeago'), true); + localTimeAgo(document.querySelectorAll('abbr.timeago, .js-timeago'), true); /** * This disables form buttons while a form is submitting |