summaryrefslogtreecommitdiff
path: root/app/assets/javascripts
diff options
context:
space:
mode:
authorTim Zallmann <tzallmann@gitlab.com>2018-12-12 22:49:10 +0100
committerTim Zallmann <tzallmann@gitlab.com>2018-12-12 22:49:45 +0100
commit14d3b53aa8821f1c86faccd01a3e32a4f0c7fe05 (patch)
treee87703f33f5c05530f7926911b2853cb377e0a65 /app/assets/javascripts
parentf5eddb807440b1d41244d00323f8523179f24e16 (diff)
downloadgitlab-ce-14d3b53aa8821f1c86faccd01a3e32a4f0c7fe05.tar.gz
Comment user avatar Image, Changed Fixtures, added new shadow colortz-user-popover-follow-up
Needed to reorder css variables Neede to reorder vars again Added Changelog
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r--app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_image.vue1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_image.vue b/app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_image.vue
index e833a8e0483..95f4395ac13 100644
--- a/app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_image.vue
+++ b/app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_image.vue
@@ -67,6 +67,7 @@ export default {
// In both cases we should render the defaultAvatarUrl
sanitizedSource() {
let baseSrc = this.imgSrc === '' || this.imgSrc === null ? defaultAvatarUrl : this.imgSrc;
+ // Only adds the width to the URL if its not a base64 data image
if (!baseSrc.startsWith('data:') && !baseSrc.includes('?')) baseSrc += `?width=${this.size}`;
return baseSrc;
},