about summary refs log tree commit diff
path: root/config/routes.rb
diff options
context:
space:
mode:
authorJenkins <jenkins@jenkins.ninjawedding.org>2018-01-03 20:17:13 +0000
committerJenkins <jenkins@jenkins.ninjawedding.org>2018-01-03 20:17:13 +0000
commitfc884d015a1a2d6c31976af3d63039390fa15939 (patch)
tree0cb950fd716f3f2cb9f13348cf42fb6e4bc8b909 /config/routes.rb
parent933840bebf4ce8f5282c88e8c3e8c1b3675fbf2d (diff)
parentd907d4352e9b6cb22bc1fabd42ca3fc60aef8a37 (diff)
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'config/routes.rb')
-rw-r--r--config/routes.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/config/routes.rb b/config/routes.rb
index f45684519..075df8225 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -54,7 +54,8 @@ Rails.application.routes.draw do
 
     resources :followers, only: [:index], controller: :follower_accounts
     resources :following, only: [:index], controller: :following_accounts
-    resource :follow, only: [:create], controller: :account_follow
+    resources :follows, only: [:show], module: :activitypub
+    resource :follow, only: [:create], controller: :account_follow, as: :follows
     resource :unfollow, only: [:create], controller: :account_unfollow
     resource :outbox, only: [:show], module: :activitypub
     resource :inbox, only: [:create], module: :activitypub