diff options
| author | Erwan Leboucher <erwanleboucher@gmail.com> | 2017-04-07 12:43:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 12:43:56 +0200 |
| commit | 0c4e9fdda051d0322608c9abdaa158529c8feacd (patch) | |
| tree | db5e8aae085529913e4567c0a81a00c1d2b22356 /app/controllers/accounts_controller.rb | |
| parent | a0f1f9c6649f44183b9c1525433c1c6e7f052492 (diff) | |
| parent | 624a9a7136159d460228a0c2f5df18a9ead3b7f2 (diff) | |
Merge branch 'master' into patch-4
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 |