diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-26 00:10:59 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-26 00:10:59 +0300 |
commit | a53c0ca02cc35bd485af15b46ace3c9c2ac48c64 (patch) | |
tree | 431f1db1af18a00010516d5b389e02ebc3d79547 /app/assets/javascripts/profile | |
parent | 01ae05ffd11edc648e94c44007fced664bc089ea (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/profile')
-rw-r--r-- | app/assets/javascripts/profile/account/components/update_username.vue | 8 |
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" |