diff options
| author | Eugen <eugen@zeonfederated.com> | 2017-02-07 02:08:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-07 02:08:40 +0100 |
| commit | 9d5fb49cd80ee31f83bf5364338bd829e3eae1d6 (patch) | |
| tree | bb49d530bdb47d3576987d48a69698779b6504da /app/controllers | |
| parent | 8a081ce588594154f93702ac2983cb7c0fca015a (diff) | |
| parent | 28cbb6dc2176cb9ba57841c6dc52b9dbfaf074c8 (diff) | |
Merge pull request #603 from evanminto/activitypub-account
Expose ActivityStreams 2.0 representation of accounts
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/accounts_controller.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb index 411a41ccc..b837f006e 100644 --- a/app/controllers/accounts_controller.rb +++ b/app/controllers/accounts_controller.rb @@ -18,6 +18,8 @@ class AccountsController < ApplicationController format.atom do @entries = @account.stream_entries.order('id desc').where(hidden: false).with_includes.paginate_by_max_id(20, params[:max_id], params[:since_id]) end + + format.activitystreams2 end end |