about summary refs log tree commit diff
path: root/app/helpers/home_helper.rb
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2018-12-16 15:26:50 +0100
committerGitHub <noreply@github.com>2018-12-16 15:26:50 +0100
commit396c5dea87f259255f3676bb7b30f5cfdfec9d4e (patch)
tree33c64f250983b0d8c07bad2a0ec970539e78b1d6 /app/helpers/home_helper.rb
parentf0505a5b2e727da73c8aa651b804508a8187a3c4 (diff)
parent7238e4ea5f4f619396f73009032844d95bdf809c (diff)
Merge pull request #856 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/helpers/home_helper.rb')
-rw-r--r--app/helpers/home_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/home_helper.rb b/app/helpers/home_helper.rb
index ba7c443c2..9b3f1380b 100644
--- a/app/helpers/home_helper.rb
+++ b/app/helpers/home_helper.rb
@@ -23,7 +23,7 @@ module HomeHelper
                   else
                     link_to(path || TagManager.instance.url_for(account), class: 'account__display-name') do
                       content_tag(:div, class: 'account__avatar-wrapper') do
-                        content_tag(:div, '', class: 'account__avatar', style: "width: #{size}px; height: #{size}px; background-size: #{size}px #{size}px; background-image: url(#{account.avatar.url})")
+                        content_tag(:div, '', class: 'account__avatar', style: "width: #{size}px; height: #{size}px; background-size: #{size}px #{size}px; background-image: url(#{full_asset_url(current_account&.user&.setting_auto_play_gif ? account.avatar_original_url : account.avatar_static_url)})")
                       end +
                         content_tag(:span, class: 'display-name') do
                           content_tag(:bdi) do