diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-11-14 20:29:15 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-14 20:29:15 +0100 |
commit | 7a8cd0cb0a61d5091071d682bfb263247a324d3a (patch) | |
tree | af9c127d24fdc5285841faffc9d2e89a9f0c0737 /config/routes.rb | |
parent | a34aa2a5f99200f313942af60ead3d5805de3998 (diff) | |
parent | 71982e5c831f25f7a8d2807c2139b3ac8e26485d (diff) |
Merge pull request #1928 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/routes.rb')
-rw-r--r-- | config/routes.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config/routes.rb b/config/routes.rb index 1c7b4eda2..8639f0ef5 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -74,7 +74,7 @@ Rails.application.routes.draw do end end - devise_for :users, path: 'auth', controllers: { + devise_for :users, path: 'auth', format: false, controllers: { omniauth_callbacks: 'auth/omniauth_callbacks', sessions: 'auth/sessions', registrations: 'auth/registrations', @@ -219,7 +219,7 @@ Rails.application.routes.draw do resource :relationships, only: [:show, :update] resource :statuses_cleanup, controller: :statuses_cleanup, only: [:show, :update] - get '/media_proxy/:id/(*any)', to: 'media_proxy#show', as: :media_proxy + get '/media_proxy/:id/(*any)', to: 'media_proxy#show', as: :media_proxy, format: false resource :authorize_interaction, only: [:show, :create] resource :share, only: [:show, :create] @@ -426,7 +426,7 @@ Rails.application.routes.draw do get '/admin', to: redirect('/admin/dashboard', status: 302) - namespace :api do + namespace :api, format: false do # OEmbed get '/oembed', to: 'oembed#show', as: :oembed |