Skip to content

G
gitlab-ce
Commit 1397db0f authored by Filipa Lacerda's avatar Filipa Lacerda
Browse files
Options

Fix conflicts caused by vue_shared/components/user_avatar/user_avatar_image.vue

parent 26342bf0
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 2 deletions
app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_image.vue
View file @ 1397db0f
...@@ -85,8 +85,6 @@ export default { ...@@ -85,8 +85,6 @@ export default {
<template> <template>
<img <img
v-tooltip v-tooltip
class="avatar"
data-boundary="window"
:class="{ :class="{
lazy: lazy, lazy: lazy,
[avatarSizeClass]: true, [avatarSizeClass]: true,
...@@ -101,5 +99,6 @@ export default { ...@@ -101,5 +99,6 @@ export default {
:data-placement="tooltipPlacement" :data-placement="tooltipPlacement"
:title="tooltipText" :title="tooltipText"
class="avatar" class="avatar"
data-boundary="window"
/> />
</template> </template>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7