about summary refs log tree commit diff
path: root/app/views/accounts/_header.html.haml
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2018-09-11 20:09:00 +0200
committerGitHub <noreply@github.com>2018-09-11 20:09:00 +0200
commit82b521b4c306d75530795bce9f6c706359e7339e (patch)
tree4ac730d5c48dfd27703e33ffab034e3266f7e0ad /app/views/accounts/_header.html.haml
parent59de2868c13a61bce08923f841024fefebe3b3da (diff)
parentf1214f00d990612229c753d8657944a10b9bf8a1 (diff)
Merge pull request #724 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/accounts/_header.html.haml')
-rw-r--r--app/views/accounts/_header.html.haml5
1 files changed, 4 insertions, 1 deletions
diff --git a/app/views/accounts/_header.html.haml b/app/views/accounts/_header.html.haml
index 95e55a1b0..bfad49b6c 100644
--- a/app/views/accounts/_header.html.haml
+++ b/app/views/accounts/_header.html.haml
@@ -3,7 +3,10 @@
     = image_tag account.header.url, class: 'parallax'
   .public-account-header__bar
     = link_to short_account_url(account), class: 'avatar' do
-      = image_tag account.avatar.url
+      - if current_account&.user&.setting_auto_play_gif
+        = image_tag account.avatar_original_url
+      - else
+        = image_tag account.avatar_static_url
     .public-account-header__tabs
       .public-account-header__tabs__name
         %h1