about summary refs log tree commit diff
path: root/config/routes.rb
diff options
context:
space:
mode:
authorDavid Yip <yipdw@member.fsf.org>2018-01-08 09:48:42 -0600
committerDavid Yip <yipdw@member.fsf.org>2018-01-08 09:48:42 -0600
commit65986b6f0b66ea285b89bb82531067db146d8ecc (patch)
tree6c69dd7748ef1cd9ccc8cb1af32a4f27ca23586a /config/routes.rb
parent2dc4fbbd1a13adbdca26a0b42ee6e289e736bba1 (diff)
parentf839ac694c3f8050e4c7ec84884283e35f6ac662 (diff)
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
Diffstat (limited to 'config/routes.rb')
-rw-r--r--config/routes.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/config/routes.rb b/config/routes.rb
index 075df8225..f45684519 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -54,8 +54,7 @@ Rails.application.routes.draw do
 
     resources :followers, only: [:index], controller: :follower_accounts
     resources :following, only: [:index], controller: :following_accounts
-    resources :follows, only: [:show], module: :activitypub
-    resource :follow, only: [:create], controller: :account_follow, as: :follows
+    resource :follow, only: [:create], controller: :account_follow
     resource :unfollow, only: [:create], controller: :account_unfollow
     resource :outbox, only: [:show], module: :activitypub
     resource :inbox, only: [:create], module: :activitypub