diff options
author | ThibG <thib@sitedethib.com> | 2018-08-18 18:22:54 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-18 18:22:54 +0200 |
commit | 44e31c3e531e5c206003b7ed83ee1d6fdd3b2b53 (patch) | |
tree | e9d1366c30b94df21ec767276fbde175428399fb /config/routes.rb | |
parent | 7423c0c1308555db3072ae64141250fdd33ce235 (diff) | |
parent | bfeac6747a58b660f0d1b3766c7cfb3ea2655fce (diff) |
Merge pull request #649 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/routes.rb')
-rw-r--r-- | config/routes.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/config/routes.rb b/config/routes.rb index 824648fa4..e06b2c1d2 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -74,6 +74,9 @@ Rails.application.routes.draw do get '/@:account_username/:id', to: 'statuses#show', as: :short_account_status get '/@:account_username/:id/embed', to: 'statuses#embed', as: :embed_short_account_status + get '/interact/:id', to: 'remote_interaction#new', as: :remote_interaction + post '/interact/:id', to: 'remote_interaction#create' + namespace :settings do resource :profile, only: [:show, :update] @@ -123,7 +126,7 @@ Rails.application.routes.draw do # Remote follow resource :remote_unfollow, only: [:create] - resource :authorize_follow, only: [:show, :create] + resource :authorize_interaction, only: [:show, :create] resource :share, only: [:show, :create] namespace :admin do |