diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb index d7b1006495..3a6ba97c89 100644 --- a/app/lib/formatter.rb +++ b/app/lib/formatter.rb @@ -66,6 +66,6 @@ class Formatter end def mention_html(match, account) - "#{match.split('@').first}@#{account.username}" + "#{match.split('@').first}@#{account.username}" end end diff --git a/app/views/accounts/show.html.haml b/app/views/accounts/show.html.haml index b11a59513f..563b438495 100644 --- a/app/views/accounts/show.html.haml +++ b/app/views/accounts/show.html.haml @@ -12,6 +12,6 @@ = render partial: 'nothing_here' - else .activity-stream - = render partial: 'stream_entries/status', collection: @statuses, as: :status, cached: true + = render partial: 'stream_entries/status', collection: @statuses, as: :status = will_paginate @statuses, pagination_options