diff options
| author | ThibG <thib@sitedethib.com> | 2019-04-08 18:17:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-08 18:17:22 +0200 |
| commit | fc2f7ee8710b498c4533e229aff6391396aa7213 (patch) | |
| tree | 9576b254773166a419b932c50e8f4d354bea73c3 /app/views/accounts | |
| parent | 30500dff7cbf27fbee6eb45e20cc24ca0b7a9e77 (diff) | |
| parent | 63837a4b781ad27a4af895b0c983d4aff57d80e3 (diff) | |
Merge pull request #983 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/accounts')
| -rw-r--r-- | app/views/accounts/show.html.haml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/views/accounts/show.html.haml b/app/views/accounts/show.html.haml index 0da69728f..e4223119c 100644 --- a/app/views/accounts/show.html.haml +++ b/app/views/accounts/show.html.haml @@ -33,7 +33,9 @@ = active_link_to t('accounts.posts_with_replies'), short_account_with_replies_url(@account) = active_link_to t('accounts.media'), short_account_media_url(@account) - - if @statuses.empty? + - if user_signed_in? && @account.blocking?(current_account) + .nothing-here.nothing-here--under-tabs= t('accounts.unavailable') + - elsif @statuses.empty? = nothing_here 'nothing-here--under-tabs' - else .activity-stream |