Merge branch '39604-update-top-right-avatar-after-changing-avatar' into 'master'

#39604 - Change top-right avatar immediately upon avatar change

Closes #39604

See merge request gitlab-org/gitlab-ce!20119

1 files changed, 11 insertions, 1 deletions

diff --git a/app/assets/javascripts/profile/profile.js b/app/assets/javascripts/profile/profile.js
index 5d58d968d30..8cf7f2f23d0 100644
--- a/app/assets/javascripts/profile/profile.js
+++ b/app/assets/javascripts/profile/profile.js
@@ -61,7 +61,13 @@ export default class Profile {
       url: this.form.attr('action'),
       data: formData,
     })
-      .then(({ data }) => flash(data.message, 'notice'))
+      .then(({ data }) => {
+        if (avatarBlob != null) {
+          this.updateHeaderAvatar();
+        }
+
+        flash(data.message, 'notice');
+      })
       .then(() => {
         window.scrollTo(0, 0);
         // Enable submit button after requests ends
@@ -70,6 +76,10 @@ export default class Profile {
       .catch(error => flash(error.message));
   }
 
+  updateHeaderAvatar() {
+    $('.header-user-avatar').attr('src', this.avatarGlCrop.dataURL);
+  }
+
   setRepoRadio() {
     const multiEditRadios = $('input[name="user[multi_file]"]');
     if (this.newRepoActivated || this.newRepoActivated === 'true') {