Add latest changes from gitlab-org/gitlab@master

2 files changed, 8 insertions, 8 deletions

diff --git a/app/assets/javascripts/profile/account/components/update_username.vue b/app/assets/javascripts/profile/account/components/update_username.vue
index c99133fd251..b038b78088f 100644
--- a/app/assets/javascripts/profile/account/components/update_username.vue
+++ b/app/assets/javascripts/profile/account/components/update_username.vue
@@ -1,7 +1,7 @@
 <script>
 import { GlSafeHtmlDirective as SafeHtml, GlButton, GlModal, GlModalDirective } from '@gitlab/ui';
 import { escape } from 'lodash';
-import createFlash from '~/flash';
+import { createAlert, VARIANT_INFO } from '~/flash';
 import axios from '~/lib/utils/axios_utils';
 import { __, s__, sprintf } from '~/locale';
 
@@ -85,12 +85,12 @@ Please update your Git repository remotes as soon as possible.`),
       return axios
         .put(this.actionUrl, putData)
         .then((result) => {
-          createFlash({ message: result.data.message, type: 'notice' });
+          createAlert({ message: result.data.message, variant: VARIANT_INFO });
           this.username = username;
           this.isRequestPending = false;
         })
         .catch((error) => {
-          createFlash({
+          createAlert({
             message:
               error?.response?.data?.message ||
               s__('Profiles|An error occurred while updating your username, please try again.'),
diff --git a/app/assets/javascripts/profile/preferences/components/profile_preferences.vue b/app/assets/javascripts/profile/preferences/components/profile_preferences.vue
index b30b6a2faa9..a33a20b49f6 100644
--- a/app/assets/javascripts/profile/preferences/components/profile_preferences.vue
+++ b/app/assets/javascripts/profile/preferences/components/profile_preferences.vue
@@ -1,6 +1,6 @@
 <script>
 import { GlButton } from '@gitlab/ui';
-import createFlash, { FLASH_TYPES } from '~/flash';
+import { createAlert, VARIANT_DANGER, VARIANT_INFO } from '~/flash';
 import { INTEGRATION_VIEW_CONFIGS, i18n } from '../constants';
 import IntegrationView from './integration_view.vue';
 
@@ -94,15 +94,15 @@ export default {
         return;
       }
       updateClasses(this.bodyClasses, this.getSelectedTheme().css_class, this.selectedLayout);
-      const { message = this.$options.i18n.defaultSuccess, type = FLASH_TYPES.NOTICE } =
+      const { message = this.$options.i18n.defaultSuccess, variant = VARIANT_INFO } =
         customEvent?.detail?.[0] || {};
-      createFlash({ message, type });
+      createAlert({ message, variant });
       this.isSubmitEnabled = true;
     },
     handleError(customEvent) {
-      const { message = this.$options.i18n.defaultError, type = FLASH_TYPES.ALERT } =
+      const { message = this.$options.i18n.defaultError, variant = VARIANT_DANGER } =
         customEvent?.detail?.[0] || {};
-      createFlash({ message, type });
+      createAlert({ message, variant });
       this.isSubmitEnabled = true;
     },
   },