diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-06-13 09:52:32 +0100 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-06-13 09:52:32 +0100 |
| commit | 1397db0f1d6d567763741503ee14526642ef71f6 (patch) | |
| tree | 1315e587b1f32b704588bc8cd1501d8594d0b59f /app/assets/javascripts | |
| parent | 26342bf01ca881a806cd1b66a9948fb384dbe589 (diff) | |
| download | gitlab-ce-1397db0f1d6d567763741503ee14526642ef71f6.tar.gz | |
Fix conflicts caused by vue_shared/components/user_avatar/user_avatar_image.vue
Diffstat (limited to 'app/assets/javascripts')
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_image.vue | 3 |
1 files changed, 1 insertions, 2 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 c7013338695..3a413c74410 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 @@ -85,8 +85,6 @@ export default { <template> <img v-tooltip - class="avatar" - data-boundary="window" :class="{ lazy: lazy, [avatarSizeClass]: true, @@ -101,5 +99,6 @@ export default { :data-placement="tooltipPlacement" :title="tooltipText" class="avatar" + data-boundary="window" /> </template> |