diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-08-21 18:24:48 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-08-21 18:24:48 +0200 |
commit | 8b4abaa90d8dff64525d92c3ba1c750356608240 (patch) | |
tree | 51f194442d2ec7ab760b443b98c7685f64481ca7 /config/routes.rb | |
parent | c78918162642649ce294d89effbf2e815c2aa327 (diff) | |
parent | f06fa099625e928e5858ea81a20be1eddf6c6fbb (diff) |
Merge branch 'master' into glitch-soc/master
Conflicts: config/routes.rb Added the “endorsements” route from upstream.
Diffstat (limited to 'config/routes.rb')
-rw-r--r-- | config/routes.rb | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/config/routes.rb b/config/routes.rb index 3e0be9380..dffa2fb8b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -267,18 +267,19 @@ Rails.application.routes.draw do get '/search', to: 'search#index', as: :search - resources :follows, only: [:create] - resources :media, only: [:create, :update] - resources :blocks, only: [:index] - resources :mutes, only: [:index] do + resources :follows, only: [:create] + resources :media, only: [:create, :update] + resources :blocks, only: [:index] + resources :mutes, only: [:index] do collection do get 'details' end end - resources :favourites, only: [:index] - resources :bookmarks, only: [:index] - resources :reports, only: [:index, :create] - resources :filters, only: [:index, :create, :show, :update, :destroy] + resources :favourites, only: [:index] + resources :bookmarks, only: [:index] + resources :reports, only: [:index, :create] + resources :filters, only: [:index, :create, :show, :update, :destroy] + resources :endorsements, only: [:index] namespace :apps do get :verify_credentials, to: 'credentials#show' |