diff options
| author | ThibG <thib@sitedethib.com> | 2018-09-01 17:44:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-01 17:44:06 +0200 |
| commit | 2b82829a5351855bbf8dccdb57c8f7dbd598b6bb (patch) | |
| tree | b3754c8ac02614e821c6680cf31ecb64389aca36 /app/helpers/stream_entries_helper.rb | |
| parent | cc7adf7e842b662fafc1eb1a9de3b7a450abbd1a (diff) | |
| parent | a74a7d5fe30dad5e2e4a3ac5e199ce18db75fe59 (diff) | |
Merge pull request #699 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/helpers/stream_entries_helper.rb')
| -rw-r--r-- | app/helpers/stream_entries_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/stream_entries_helper.rb b/app/helpers/stream_entries_helper.rb index 187bfe4a0..ac655f622 100644 --- a/app/helpers/stream_entries_helper.rb +++ b/app/helpers/stream_entries_helper.rb @@ -22,12 +22,12 @@ module StreamEntriesHelper link_to account_unfollow_path(account), class: 'button logo-button button--destructive', data: { method: :post } do safe_join([render(file: Rails.root.join('app', 'javascript', 'images', 'logo.svg')), t('accounts.unfollow')]) end - else + elsif !(account.memorial? || account.moved?) link_to account_follow_path(account), class: 'button logo-button', data: { method: :post } do safe_join([render(file: Rails.root.join('app', 'javascript', 'images', 'logo.svg')), t('accounts.follow')]) end end - else + elsif !(account.memorial? || account.moved?) link_to account_remote_follow_path(account), class: 'button logo-button modal-button', target: '_new' do safe_join([render(file: Rails.root.join('app', 'javascript', 'images', 'logo.svg')), t('accounts.follow')]) end |