Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/assets/javascripts/profile/account')
-rw-r--r--app/assets/javascripts/profile/account/components/update_username.vue8
1 files changed, 6 insertions, 2 deletions
diff --git a/app/assets/javascripts/profile/account/components/update_username.vue b/app/assets/javascripts/profile/account/components/update_username.vue
index c5478aa0226..f18c4d8f03e 100644
--- a/app/assets/javascripts/profile/account/components/update_username.vue
+++ b/app/assets/javascripts/profile/account/components/update_username.vue
@@ -90,7 +90,10 @@ Please update your Git repository remotes as soon as possible.`),
this.isRequestPending = false;
})
.catch((error) => {
- Flash(error.response.data.message);
+ Flash(
+ error?.response?.data?.message ||
+ s__('Profiles|An error occurred while updating your username, please try again.'),
+ );
this.isRequestPending = false;
throw error;
});
@@ -121,7 +124,8 @@ Please update your Git repository remotes as soon as possible.`),
</div>
<gl-button
v-gl-modal-directive="$options.modalId"
- :disabled="isRequestPending || newUsername === username"
+ :disabled="newUsername === username"
+ :loading="isRequestPending"
category="primary"
variant="warning"
data-testid="username-change-confirmation-modal"