diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
commit | 8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781 (patch) | |
tree | a77e7fe7a93de11213032ed4ab1f33a3db51b738 /app/assets/javascripts/pages/admin | |
parent | 00b35af3db1abfe813a778f643dad221aad51fca (diff) |
Add latest changes from gitlab-org/gitlab@13-1-stable-ee
Diffstat (limited to 'app/assets/javascripts/pages/admin')
4 files changed, 11 insertions, 6 deletions
diff --git a/app/assets/javascripts/pages/admin/application_settings/index.js b/app/assets/javascripts/pages/admin/application_settings/index.js index 493c216cc6e..143d15f92cd 100644 --- a/app/assets/javascripts/pages/admin/application_settings/index.js +++ b/app/assets/javascripts/pages/admin/application_settings/index.js @@ -2,8 +2,12 @@ import initSettingsPanels from '~/settings_panels'; import projectSelect from '~/project_select'; import selfMonitor from '~/self_monitor'; import maintenanceModeSettings from '~/maintenance_mode_settings'; +import initVariableList from '~/ci_variable_list'; document.addEventListener('DOMContentLoaded', () => { + if (gon.features?.ciInstanceVariablesUi) { + initVariableList('js-instance-variables'); + } selfMonitor(); maintenanceModeSettings(); // Initialize expandable settings panels diff --git a/app/assets/javascripts/pages/admin/groups/edit/index.js b/app/assets/javascripts/pages/admin/groups/edit/index.js index ad7276132b9..a4e5df559ff 100644 --- a/app/assets/javascripts/pages/admin/groups/edit/index.js +++ b/app/assets/javascripts/pages/admin/groups/edit/index.js @@ -1,3 +1,3 @@ -import initAvatarPicker from '~/avatar_picker'; +import initFilePickers from '~/file_pickers'; -document.addEventListener('DOMContentLoaded', initAvatarPicker); +document.addEventListener('DOMContentLoaded', initFilePickers); diff --git a/app/assets/javascripts/pages/admin/groups/new/index.js b/app/assets/javascripts/pages/admin/groups/new/index.js index 6de740ee9ce..b94c999ed12 100644 --- a/app/assets/javascripts/pages/admin/groups/new/index.js +++ b/app/assets/javascripts/pages/admin/groups/new/index.js @@ -1,9 +1,10 @@ import BindInOut from '../../../../behaviors/bind_in_out'; import Group from '../../../../group'; -import initAvatarPicker from '~/avatar_picker'; +import initFilePickers from '~/file_pickers'; document.addEventListener('DOMContentLoaded', () => { BindInOut.initAll(); - new Group(); // eslint-disable-line no-new - initAvatarPicker(); + initFilePickers(); + + return new Group(); }); diff --git a/app/assets/javascripts/pages/admin/projects/index/components/delete_project_modal.vue b/app/assets/javascripts/pages/admin/projects/index/components/delete_project_modal.vue index b22fbf6b833..8bb093da771 100644 --- a/app/assets/javascripts/pages/admin/projects/index/components/delete_project_modal.vue +++ b/app/assets/javascripts/pages/admin/projects/index/components/delete_project_modal.vue @@ -92,7 +92,7 @@ export default { @submit="onSubmit" @cancel="onCancel" > - <template slot="body" slot-scope="props"> + <template #body="props"> <p v-html="props.text"></p> <p v-html="confirmationTextLabel"></p> <form ref="form" :action="deleteProjectUrl" method="post"> |