tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into glitch-soc/master

Browse Source 
Conflicts:
	config/routes.rb

Added the “endorsements” route from upstream.
This commit is contained in:
Thibaut Girka
2018-08-21 18:24:48 +02:00
parent c789181626 f06fa09962
commit 8b4abaa90d
41 changed files with 215 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
config/routes.rb
View File

@ -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'