about summary refs log tree commit diff
path: root/config
diff options
context:
space:
mode:
authorEvan Minto <evan.minto@gmail.com>2017-02-06 01:19:05 -0800
committerEvan Minto <evan.minto@gmail.com>2017-02-06 01:19:26 -0800
commit94e213c6c11fb3476a6c151425052775427574e1 (patch)
tree93d3ef2c7c6d96801693e9268f24c481a2bb6af5 /config
parent8bd8ea7c0406a8eeb145471475b105366e195e6a (diff)
Reuse existing controller and route
Diffstat (limited to 'config')
-rw-r--r--config/initializers/mime_types.rb5
-rw-r--r--config/routes.rb4
2 files changed, 3 insertions, 6 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
diff --git a/config/routes.rb b/config/routes.rb
index 4d0138b82..699f56833 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -153,10 +153,6 @@ Rails.application.routes.draw do
       end
     end
 
-    namespace :activitypub do
-      resources :accounts, only: [:show]
-    end
-
     namespace :web do
       resource :settings, only: [:update]
     end