diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2018-09-20 13:24:20 +0000 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2018-09-20 13:24:20 +0000 |
commit | 00057a75f4f7433d8594ec7adb480ab39a7cb008 (patch) | |
tree | 2630af73ad1c3a8510152cf0e7cb3e9103c6d942 /app/assets/javascripts/pages/admin | |
parent | ac3157a0d5c3cd32ebc68c0f29e48d7a9c64edc5 (diff) | |
parent | 26225e778d7e5beb9861756890bf2fddb19af77b (diff) | |
download | gitlab-ce-00057a75f4f7433d8594ec7adb480ab39a7cb008.tar.gz |
Merge branch '44998-split-admin-settings-into-multiple-sub-pages' into 'master'
Resolve "Split admin settings into multiple sub pages"
Closes #44998
See merge request gitlab-org/gitlab-ce!21467
Diffstat (limited to 'app/assets/javascripts/pages/admin')
-rw-r--r-- | app/assets/javascripts/pages/admin/application_settings/index.js | 5 | ||||
-rw-r--r-- | app/assets/javascripts/pages/admin/application_settings/metrics_and_profiling/index.js | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/app/assets/javascripts/pages/admin/application_settings/index.js b/app/assets/javascripts/pages/admin/application_settings/index.js index 069f8ce55d0..47bd70537f1 100644 --- a/app/assets/javascripts/pages/admin/application_settings/index.js +++ b/app/assets/javascripts/pages/admin/application_settings/index.js @@ -1,13 +1,8 @@ import initSettingsPanels from '~/settings_panels'; import projectSelect from '~/project_select'; -import UsagePingPayload from './usage_ping_payload'; document.addEventListener('DOMContentLoaded', () => { // Initialize expandable settings panels initSettingsPanels(); projectSelect(); - new UsagePingPayload( - document.querySelector('.js-usage-ping-payload-trigger'), - document.querySelector('.js-usage-ping-payload'), - ).init(); }); diff --git a/app/assets/javascripts/pages/admin/application_settings/metrics_and_profiling/index.js b/app/assets/javascripts/pages/admin/application_settings/metrics_and_profiling/index.js new file mode 100644 index 00000000000..c40503603be --- /dev/null +++ b/app/assets/javascripts/pages/admin/application_settings/metrics_and_profiling/index.js @@ -0,0 +1,8 @@ +import UsagePingPayload from './../usage_ping_payload'; + +document.addEventListener('DOMContentLoaded', () => { + new UsagePingPayload( + document.querySelector('.js-usage-ping-payload-trigger'), + document.querySelector('.js-usage-ping-payload'), + ).init(); +}); |