diff options
| author | ThibG <thib@sitedethib.com> | 2018-09-11 20:09:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-11 20:09:00 +0200 |
| commit | 82b521b4c306d75530795bce9f6c706359e7339e (patch) | |
| tree | 4ac730d5c48dfd27703e33ffab034e3266f7e0ad /app/views | |
| parent | 59de2868c13a61bce08923f841024fefebe3b3da (diff) | |
| parent | f1214f00d990612229c753d8657944a10b9bf8a1 (diff) | |
Merge pull request #724 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/accounts/_header.html.haml | 5 | ||||
| -rw-r--r-- | app/views/layouts/modal.html.haml | 2 |
2 files changed, 5 insertions, 2 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 diff --git a/app/views/layouts/modal.html.haml b/app/views/layouts/modal.html.haml index a86b4fd3f..b6e33ca91 100644 --- a/app/views/layouts/modal.html.haml +++ b/app/views/layouts/modal.html.haml @@ -5,7 +5,7 @@ .name = t 'users.signed_in_as' %span.username @#{current_account.local_username_and_domain} - = link_to destroy_user_session_path, method: :delete, class: 'logout-link icon-button' do + = link_to destroy_user_session_path(continue: true), method: :delete, class: 'logout-link icon-button' do = fa_icon 'sign-out' .container-alt= yield |