about summary refs log tree commit diff
path: root/config/initializers
diff options
context:
space:
mode:
authorEugen <eugen@zeonfederated.com>2017-02-07 02:08:40 +0100
committerGitHub <noreply@github.com>2017-02-07 02:08:40 +0100
commit9d5fb49cd80ee31f83bf5364338bd829e3eae1d6 (patch)
treebb49d530bdb47d3576987d48a69698779b6504da /config/initializers
parent8a081ce588594154f93702ac2983cb7c0fca015a (diff)
parent28cbb6dc2176cb9ba57841c6dc52b9dbfaf074c8 (diff)
Merge pull request #603 from evanminto/activitypub-account
Expose ActivityStreams 2.0 representation of accounts
Diffstat (limited to 'config/initializers')
-rw-r--r--config/initializers/mime_types.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb
index 5a16a14e8..b1b73c846 100644
--- a/config/initializers/mime_types.rb
+++ b/config/initializers/mime_types.rb
@@ -1,4 +1,5 @@
 # Be sure to restart your server when you modify this file.
 
-Mime::Type.register "application/json", :json, %w( text/x-json application/jsonrequest application/jrd+json )
-Mime::Type.register "text/xml",         :xml,  %w( application/xml application/atom+xml application/xrd+xml )
+Mime::Type.register "application/json",           :json, %w( text/x-json application/jsonrequest application/jrd+json )
+Mime::Type.register "text/xml",                   :xml,  %w( application/xml application/atom+xml application/xrd+xml )
+Mime::Type.register "application/activity+json",  :activitystreams2