diff options
author | ThibG <thib@sitedethib.com> | 2019-06-10 23:01:56 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-10 23:01:56 +0200 |
commit | c64eef12069c3476f9956dfaaf6a3a9f91c14e2d (patch) | |
tree | c8048db1bc718663c5ed33c8b225544d5e37f98b /config/routes.rb | |
parent | b45f555a0c7a7d50ed7640b938eb8b5a671a0e10 (diff) | |
parent | 7778de467cd35fa4a514dd97ced0d19675f3b9d9 (diff) |
Merge pull request #1102 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/routes.rb')
-rw-r--r-- | config/routes.rb | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/config/routes.rb b/config/routes.rb index 5614a7cdc..0d49a07d6 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -87,14 +87,22 @@ Rails.application.routes.draw do get '/explore', to: 'directories#index', as: :explore get '/explore/:id', to: 'directories#show', as: :explore_hashtag + get '/settings', to: redirect('/settings/profile') + namespace :settings do resource :profile, only: [:show, :update] - resource :preferences, only: [:show, :update] - resource :notifications, only: [:show, :update] - resource :import, only: [:show, :create] + get :preferences, to: redirect('/settings/preferences/appearance') + + namespace :preferences do + resource :appearance, only: [:show, :update], controller: :appearance + resource :notifications, only: [:show, :update] + resource :other, only: [:show, :update], controller: :other + end + resource :import, only: [:show, :create] resource :export, only: [:show, :create] + namespace :exports, constraints: { format: :csv } do resources :follows, only: :index, controller: :following_accounts resources :blocks, only: :index, controller: :blocked_accounts @@ -104,6 +112,7 @@ Rails.application.routes.draw do end resource :two_factor_authentication, only: [:show, :create, :destroy] + namespace :two_factor_authentication do resources :recovery_codes, only: [:create] resource :confirmation, only: [:new, :create] |