about summary refs log tree commit diff
path: root/app/controllers
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-03-24 12:49:34 +0100
committerEugen Rochko <eugen@zeonfederated.com>2016-03-24 12:49:34 +0100
commit7e58303a8da90b31f4179695283d3ac19dfb09d1 (patch)
tree705a53da3f360379737293d234a52af1748ae312 /app/controllers
parentc8999a116ef71bef2cb28a783e4ba3d8e3cea6fa (diff)
Limit Atom feeds to 20 items by default, add pagination by max_id
(But there are no Atom feed pagination elements yet)
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/accounts_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index cfccd0f19..53f665238 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -7,7 +7,7 @@ class AccountsController < ApplicationController
   def show
     respond_to do |format|
       format.html { @statuses = @account.statuses.order('id desc').with_includes.with_counters.paginate(page: params[:page], per_page: 10)}
-      format.atom { @entries  = @account.stream_entries.order('id desc').with_includes }
+      format.atom { @entries  = @account.stream_entries.order('id desc').with_includes.paginate_by_max_id(20, params[:max_id] || nil) }
     end
   end