aboutsummaryrefslogtreecommitdiff
path: root/src/components/chat_title/chat_title.vue
diff options
context:
space:
mode:
authorSean King <seanking2919@protonmail.com>2022-08-01 18:17:09 -0600
committerSean King <seanking2919@protonmail.com>2022-08-01 18:17:09 -0600
commit081aa0fd0552732f208bd35e37cde06c66536791 (patch)
tree053827cd9d9b258d6752195ab09eabd37d4c813b /src/components/chat_title/chat_title.vue
parent75216c5feb32b32e24952663ffa4233410585785 (diff)
parent3fc9673a7d0fb851283e4ed687c2fd7790f03317 (diff)
Fix merge conflicts
Diffstat (limited to 'src/components/chat_title/chat_title.vue')
-rw-r--r--src/components/chat_title/chat_title.vue8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/components/chat_title/chat_title.vue b/src/components/chat_title/chat_title.vue
index 7f6aaaa4..ab7491fa 100644
--- a/src/components/chat_title/chat_title.vue
+++ b/src/components/chat_title/chat_title.vue
@@ -3,16 +3,16 @@
class="chat-title"
:title="title"
>
- <router-link
- class="avatar-container"
+ <UserPopover
v-if="withAvatar && user"
- :to="getUserProfileLink(user)"
+ class="avatar-container"
+ :user-id="user.id"
>
<UserAvatar
class="titlebar-avatar"
:user="user"
/>
- </router-link>
+ </UserPopover>
<RichContent
v-if="user"
class="username"