diff options
| author | ThibG <thib@sitedethib.com> | 2019-02-12 20:29:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-12 20:29:55 +0100 |
| commit | a3ba28eb17d75af37396359e8c37675e06605ccf (patch) | |
| tree | 20d81ffc7b01b132e1683685a0176ede6374c13c /config/routes.rb | |
| parent | b89e003c4d049d64d2d4015357b8b931370bc5f0 (diff) | |
| parent | b47a53f90299a1fb52423aacbc0c23427e2eb132 (diff) | |
Merge pull request #913 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/routes.rb')
| -rw-r--r-- | config/routes.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/routes.rb b/config/routes.rb index 976b25812..447a22794 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -74,6 +74,7 @@ Rails.application.routes.draw do get '/@:username', to: 'accounts#show', as: :short_account get '/@:username/with_replies', to: 'accounts#show', as: :short_account_with_replies get '/@:username/media', to: 'accounts#show', as: :short_account_media + get '/@:username/tagged/:tag', to: 'accounts#show', as: :short_account_tag get '/@:account_username/:id', to: 'statuses#show', as: :short_account_status get '/@:account_username/:id/embed', to: 'statuses#embed', as: :embed_short_account_status @@ -119,6 +120,7 @@ Rails.application.routes.draw do resource :migration, only: [:show, :update] resources :sessions, only: [:destroy] + resources :featured_tags, only: [:index, :create, :destroy] end resources :media, only: [:show] do |