diff options
Diffstat (limited to 'app/assets/javascripts/pages/admin')
-rw-r--r-- | app/assets/javascripts/pages/admin/application_settings/general/components/signup_form.vue | 10 | ||||
-rw-r--r-- | app/assets/javascripts/pages/admin/application_settings/signup_restrictions.js | 1 | ||||
-rw-r--r-- | app/assets/javascripts/pages/admin/broadcast_messages/edit/index.js | 8 | ||||
-rw-r--r-- | app/assets/javascripts/pages/admin/broadcast_messages/index/index.js (renamed from app/assets/javascripts/pages/admin/broadcast_messages/index.js) | 2 | ||||
-rw-r--r-- | app/assets/javascripts/pages/admin/dashboard/index.js | 3 | ||||
-rw-r--r-- | app/assets/javascripts/pages/admin/projects/index/components/delete_project_modal.vue | 3 |
6 files changed, 11 insertions, 16 deletions
diff --git a/app/assets/javascripts/pages/admin/application_settings/general/components/signup_form.vue b/app/assets/javascripts/pages/admin/application_settings/general/components/signup_form.vue index b68148e5461..96477b9f476 100644 --- a/app/assets/javascripts/pages/admin/application_settings/general/components/signup_form.vue +++ b/app/assets/javascripts/pages/admin/application_settings/general/components/signup_form.vue @@ -43,7 +43,6 @@ export default { 'settingsPath', 'signupEnabled', 'requireAdminApprovalAfterUserSignup', - 'sendUserConfirmationEmail', 'emailConfirmationSetting', 'minimumPasswordLength', 'minimumPasswordLengthMin', @@ -68,7 +67,6 @@ export default { form: { signupEnabled: this.signupEnabled, requireAdminApproval: this.requireAdminApprovalAfterUserSignup, - sendConfirmationEmail: this.sendUserConfirmationEmail, emailConfirmationSetting: this.emailConfirmationSetting, minimumPasswordLength: this.minimumPasswordLength, minimumPasswordLengthMin: this.minimumPasswordLengthMin, @@ -204,7 +202,6 @@ export default { buttonText: s__('ApplicationSettings|Save changes'), signupEnabledLabel: s__('ApplicationSettings|Sign-up enabled'), requireAdminApprovalLabel: s__('ApplicationSettings|Require admin approval for new sign-ups'), - sendConfirmationEmailLabel: s__('ApplicationSettings|Send confirmation email on sign-up'), emailConfirmationSettingsLabel: s__('ApplicationSettings|Email confirmation settings'), emailConfirmationSettingsOffLabel: s__('ApplicationSettings|Off'), emailConfirmationSettingsOffHelpText: s__( @@ -284,13 +281,6 @@ export default { data-testid="require-admin-approval-checkbox" /> - <signup-checkbox - v-model="form.sendConfirmationEmail" - class="gl-mb-5" - name="application_setting[send_user_confirmation_email]" - :label="$options.i18n.sendConfirmationEmailLabel" - /> - <gl-form-group :label="$options.i18n.emailConfirmationSettingsLabel"> <gl-form-radio-group v-model="form.emailConfirmationSetting" diff --git a/app/assets/javascripts/pages/admin/application_settings/signup_restrictions.js b/app/assets/javascripts/pages/admin/application_settings/signup_restrictions.js index 0d5c55cb87b..395d8a38bf7 100644 --- a/app/assets/javascripts/pages/admin/application_settings/signup_restrictions.js +++ b/app/assets/javascripts/pages/admin/application_settings/signup_restrictions.js @@ -14,7 +14,6 @@ export default function initSignupRestrictions(elementSelector = '#js-signup-for booleanAttributes: [ 'signupEnabled', 'requireAdminApprovalAfterUserSignup', - 'sendUserConfirmationEmail', 'domainDenylistEnabled', 'denylistTypeRawSelected', 'emailRestrictionsEnabled', diff --git a/app/assets/javascripts/pages/admin/broadcast_messages/edit/index.js b/app/assets/javascripts/pages/admin/broadcast_messages/edit/index.js new file mode 100644 index 00000000000..25036984082 --- /dev/null +++ b/app/assets/javascripts/pages/admin/broadcast_messages/edit/index.js @@ -0,0 +1,8 @@ +import initEditBroadcastMessage from '~/admin/broadcast_messages/edit'; +import initBroadcastMessagesForm from '../broadcast_message'; + +if (gon.features.vueBroadcastMessages) { + initEditBroadcastMessage(); +} else { + initBroadcastMessagesForm(); +} diff --git a/app/assets/javascripts/pages/admin/broadcast_messages/index.js b/app/assets/javascripts/pages/admin/broadcast_messages/index/index.js index ffd976be8c6..1f37df2b340 100644 --- a/app/assets/javascripts/pages/admin/broadcast_messages/index.js +++ b/app/assets/javascripts/pages/admin/broadcast_messages/index/index.js @@ -1,6 +1,6 @@ import initBroadcastMessages from '~/admin/broadcast_messages'; import initDeprecatedRemoveRowBehavior from '~/behaviors/deprecated_remove_row_behavior'; -import initBroadcastMessagesForm from './broadcast_message'; +import initBroadcastMessagesForm from '../broadcast_message'; if (gon.features.vueBroadcastMessages) { initBroadcastMessages(); diff --git a/app/assets/javascripts/pages/admin/dashboard/index.js b/app/assets/javascripts/pages/admin/dashboard/index.js deleted file mode 100644 index b63e612be47..00000000000 --- a/app/assets/javascripts/pages/admin/dashboard/index.js +++ /dev/null @@ -1,3 +0,0 @@ -import initGitlabVersionCheck from '~/gitlab_version_check'; - -initGitlabVersionCheck(); 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 b06c804f3ca..48241a213ef 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 @@ -1,6 +1,7 @@ <script> -import { GlSafeHtmlDirective as SafeHtml, GlModal } from '@gitlab/ui'; +import { GlModal } from '@gitlab/ui'; import { escape } from 'lodash'; +import SafeHtml from '~/vue_shared/directives/safe_html'; import { __, s__, sprintf } from '~/locale'; export default { |