diff options
author | Valentin Ouvrard <valentin210594@gmail.com> | 2017-04-08 13:39:09 +1100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-08 13:39:09 +1100 |
commit | 3e4eb9c95fc8d8f3fff1db90215d5050214adc59 (patch) | |
tree | c9f709f2582f8fe97c72b4faa8bc0811bbbb4deb /app/controllers/accounts_controller.rb | |
parent | 93e53a3311c33b218d1cf7ae26b74056dfabc909 (diff) | |
parent | fc7b8307190b8f472b526d99bc10db58153850d5 (diff) |
Merge branch 'master' into master
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 |