diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-10-01 12:43:20 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-10-01 12:43:20 +0200 |
commit | c91d9b7389c489980fe98812a8f3884b2d41e19e (patch) | |
tree | 78509567984a32411c661167e254c8645eba2919 /config/routes.rb | |
parent | 4e60a0d5433f5dfa4f71a452cc5c6ceb0f21ceab (diff) | |
parent | 5d5d1b528eda560191b2813714c9e461fda3c9d8 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: app/lib/user_settings_decorator.rb app/models/user.rb app/serializers/initial_state_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.en.yml config/locales/simple_form.ja.yml config/locales/simple_form.pl.yml config/routes.rb
Diffstat (limited to 'config/routes.rb')
-rw-r--r-- | config/routes.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config/routes.rb b/config/routes.rb index 90333daab..db79fc323 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -21,6 +21,7 @@ Rails.application.routes.draw do get '.well-known/host-meta', to: 'well_known/host_meta#show', as: :host_meta, defaults: { format: 'xml' } get '.well-known/webfinger', to: 'well_known/webfinger#show', as: :webfinger + get '.well-known/change-password', to: redirect('/auth/edit') get 'manifest', to: 'manifests#show', defaults: { format: 'json' } get 'intent', to: 'intents#show' get 'custom.css', to: 'custom_css#show', as: :custom_css @@ -279,7 +280,7 @@ Rails.application.routes.draw do end resources :favourites, only: [:index] resources :bookmarks, only: [:index] - resources :reports, only: [:index, :create] + resources :reports, only: [:create] resources :filters, only: [:index, :create, :show, :update, :destroy] resources :endorsements, only: [:index] |