diff options
author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:39:59 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-07 22:39:59 -0400 |
commit | c890b86ef6843bb794d895121383e1dec9ce3256 (patch) | |
tree | 155cba19e20c12450930e3b2735034c08e1ed628 /app/controllers/accounts_controller.rb | |
parent | eadac4e7f4ed44e868131f8b969a7f3dbc297e92 (diff) | |
parent | ceba26d5276b18d0de29fc989ef7c343e6a85962 (diff) |
Merge branch 'master' into patch-2
Diffstat (limited to 'app/controllers/accounts_controller.rb')
-rw-r--r-- | app/controllers/accounts_controller.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb index dc1aeb5ea..619c04be2 100644 --- a/app/controllers/accounts_controller.rb +++ b/app/controllers/accounts_controller.rb @@ -16,7 +16,8 @@ class AccountsController < ApplicationController end format.atom do - @entries = @account.stream_entries.order('id desc').where(activity_type: 'Status').where(hidden: false).with_includes.paginate_by_max_id(20, params[:max_id], params[:since_id]) + @entries = @account.stream_entries.order('id desc').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 format.activitystreams2 |