diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-09-11 16:51:26 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-09-11 16:51:26 +0200 |
| commit | cd99255698354f3b5ec1c0d5d9bc1b4fb9bffdf3 (patch) | |
| tree | 0486b73191a98645e0620fefe8743f4a0c44bef5 /app/views/accounts/_header.html.haml | |
| parent | 65f625cf237feb55a21495606d5e2c258bbe50cc (diff) | |
| parent | bda0f7ac7353a63b42ca99b2e7d4e80a3b03b850 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: app/controllers/oauth/authorizations_controller.rb Just two changes being too close to one another. Took both.
Diffstat (limited to 'app/views/accounts/_header.html.haml')
| -rw-r--r-- | app/views/accounts/_header.html.haml | 5 |
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 |