diff options
author | Akihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp> | 2017-05-26 23:35:25 +0900 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-05-26 16:35:25 +0200 |
commit | 860e257a6895030db112a3e81f6d0a3e398a7b74 (patch) | |
tree | 06bc4ecb659c51c0719415c2a24ef6d4239492b9 /app | |
parent | 902d9e34b4731f2654e2762e97966025b5cd7d62 (diff) |
Remove redundant call of recent scope in AccountsController (#3330)
recent is included in paginate_by_max_id.
Diffstat (limited to 'app')
-rw-r--r-- | app/controllers/accounts_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb index 3e580448e..11402ab79 100644 --- a/app/controllers/accounts_controller.rb +++ b/app/controllers/accounts_controller.rb @@ -6,12 +6,12 @@ class AccountsController < ApplicationController def show respond_to do |format| format.html do - @statuses = @account.statuses.permitted_for(@account, current_account).recent.paginate_by_max_id(20, params[:max_id], params[:since_id]) + @statuses = @account.statuses.permitted_for(@account, current_account).paginate_by_max_id(20, params[:max_id], params[:since_id]) @statuses = cache_collection(@statuses, Status) end format.atom do - @entries = @account.stream_entries.recent.where(hidden: false).with_includes.paginate_by_max_id(20, params[:max_id], params[:since_id]) + @entries = @account.stream_entries.where(hidden: false).with_includes.paginate_by_max_id(20, params[:max_id], params[:since_id]) render xml: AtomSerializer.render(AtomSerializer.new.feed(@account, @entries.to_a)) end |