diff options
author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-01-08 10:17:15 +0000 |
---|---|---|
committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-01-08 10:17:15 +0000 |
commit | f839ac694c3f8050e4c7ec84884283e35f6ac662 (patch) | |
tree | 68ab420feffbfc99de00d72f2e6b0beae4a7b7a0 /config/routes.rb | |
parent | 722b3f567f18ae31b05f320441c73279b4f5ad11 (diff) | |
parent | dbda87c31f7d7ede7312ba422940841d8c96c171 (diff) |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'config/routes.rb')
-rw-r--r-- | config/routes.rb | 3 |
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 |