diff options
| author | Ondřej Hruška <ondra@ondrovo.com> | 2017-07-18 18:59:00 +0200 |
|---|---|---|
| committer | Ondřej Hruška <ondra@ondrovo.com> | 2017-07-18 18:59:00 +0200 |
| commit | df74e26baf3c639d0419a7b809208636e81d93f3 (patch) | |
| tree | ef0462e5fcc8cc7962ef42d80f7dd520a574a7c5 /app/controllers/accounts_controller.rb | |
| parent | c727eae4412ac9e4f1bafdc68fe89dcd46d602ca (diff) | |
| parent | d69fa9e1f40124279ec9d772e5f54d1e11724e2d (diff) | |
Merge branch 'tootsuite-master'
Diffstat (limited to 'app/controllers/accounts_controller.rb')
| -rw-r--r-- | app/controllers/accounts_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb index a95aabf1d..37a1e540f 100644 --- a/app/controllers/accounts_controller.rb +++ b/app/controllers/accounts_controller.rb @@ -13,7 +13,7 @@ class AccountsController < ApplicationController format.atom do @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)) + render xml: Ostatus::AtomSerializer.render(Ostatus::AtomSerializer.new.feed(@account, @entries.to_a)) end format.json do |