Add latest changes from gitlab-org/gitlab@15-2-stable-eev15.2.0-rc42

2 files changed, 7 insertions, 6 deletions

diff --git a/app/assets/javascripts/profile/account/index.js b/app/assets/javascripts/profile/account/index.js
index 00fe0bcf89b..f208280af27 100644
--- a/app/assets/javascripts/profile/account/index.js
+++ b/app/assets/javascripts/profile/account/index.js
@@ -30,7 +30,7 @@ export default () => {
       deleteAccountModal,
     },
     mounted() {
-      deleteAccountButton.classList.remove('disabled');
+      deleteAccountButton.disabled = false;
       deleteAccountButton.addEventListener('click', () => {
         this.$root.$emit(BV_SHOW_MODAL, 'delete-account-modal', '#delete-account-button');
       });
diff --git a/app/assets/javascripts/profile/profile.js b/app/assets/javascripts/profile/profile.js
index 25fefff219c..064bcf8e4c4 100644
--- a/app/assets/javascripts/profile/profile.js
+++ b/app/assets/javascripts/profile/profile.js
@@ -1,5 +1,5 @@
 import $ from 'jquery';
-import createFlash, { FLASH_TYPES } from '~/flash';
+import { VARIANT_DANGER, VARIANT_INFO, createAlert } from '~/flash';
 import axios from '~/lib/utils/axios_utils';
 import { parseBoolean } from '~/lib/utils/common_utils';
 import { Rails } from '~/lib/utils/rails_ujs';
@@ -10,7 +10,7 @@ import TimezoneDropdown, {
 export default class Profile {
   constructor({ form } = {}) {
     this.onSubmitForm = this.onSubmitForm.bind(this);
-    this.form = form || $('.edit-user');
+    this.form = form || $('.js-edit-user');
     this.setRepoRadio();
     this.bindEvents();
     this.initAvatarGlCrop();
@@ -84,9 +84,9 @@ export default class Profile {
           this.updateHeaderAvatar();
         }
 
-        createFlash({
+        createAlert({
           message: data.message,
-          type: data.status === 'error' ? FLASH_TYPES.ALERT : FLASH_TYPES.NOTICE,
+          variant: data.status === 'error' ? VARIANT_DANGER : VARIANT_INFO,
         });
       })
       .then(() => {
@@ -95,8 +95,9 @@ export default class Profile {
         self.form.find(':input[disabled]').enable();
       })
       .catch((error) =>
-        createFlash({
+        createAlert({
           message: error.message,
+          variant: VARIANT_DANGER,
         }),
       );
   }