scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-12-27 02:04:33 +08:00
Code Issues Projects Releases Packages Wiki Activity

conflict fix

Browse source
This commit is contained in:
Giga Chubinidze 2023-07-18 14:18:41 +04:00
parent ad4724ba04
commit 3cf1c5365f
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/shared/_atwho_user_container.erb → app/views/shared/_atwho_user_container.html.erb
View file

@ -21,7 +21,7 @@
data-full-name="<%= user.full_name %>"
data-email="<%= user.email %>"
data-popover-html="<%= popover_html %>"
data-user-avatar-popover-absolute-url="<%= user_avatar_popover_absolute_url %>"
data-user-avatar-popover-absolute-url="<%= user_avatar_absolute_url(user, :thumb, user.avatar.attached?) %>"
>
<%= user.full_name %>
</a>