diff options
author | David Yip <yipdw@member.fsf.org> | 2017-11-17 17:58:13 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-17 17:58:13 -0600 |
commit | 284e2cde81811d6289dde9542f9c987062f9e7c2 (patch) | |
tree | 739fe0417fce9b9f48f924815b436a50b324dfe9 /config/routes.rb | |
parent | 6f8ccbfcdf7fd8ca651d1583a608e96b25a09e25 (diff) | |
parent | 130aa90d5500f481c181a16012724b5f81d62616 (diff) |
Merge pull request #224 from yipdw/merge-upstream
Merge upstream (tootsuite/mastodon#5703)
Diffstat (limited to 'config/routes.rb')
-rw-r--r-- | config/routes.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/config/routes.rb b/config/routes.rb index 36acd428d..7812e4b36 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -220,6 +220,7 @@ Rails.application.routes.draw do resource :home, only: :show, controller: :home resource :public, only: :show, controller: :public resources :tag, only: :show + resources :list, only: :show end resources :streaming, only: [:index] @@ -283,6 +284,10 @@ Rails.application.routes.draw do post :unmute end end + + resources :lists, only: [:index, :create, :show, :update, :destroy] do + resource :accounts, only: [:show, :create, :destroy], controller: 'lists/accounts' + end end namespace :web do |