Commit 4c8224ae1e9a89e9df5c32beb7afad2f0835fc2b
1 parent
c41e66db
Exists in
master
and in
4 other branches
Move profile account to separate controller
Showing
2 changed files
with
13 additions
and
4 deletions
Show diff stats
config/routes.rb
| @@ -99,19 +99,21 @@ Gitlab::Application.routes.draw do | @@ -99,19 +99,21 @@ Gitlab::Application.routes.draw do | ||
| 99 | # | 99 | # |
| 100 | resource :profile, only: [:show, :update] do | 100 | resource :profile, only: [:show, :update] do |
| 101 | member do | 101 | member do |
| 102 | - get :account | ||
| 103 | get :history | 102 | get :history |
| 104 | - get :token | ||
| 105 | get :design | 103 | get :design |
| 106 | 104 | ||
| 107 | - put :update_password | ||
| 108 | put :reset_private_token | 105 | put :reset_private_token |
| 109 | put :update_username | 106 | put :update_username |
| 110 | end | 107 | end |
| 111 | 108 | ||
| 112 | scope module: :profiles do | 109 | scope module: :profiles do |
| 110 | + resource :account, only: [:show, :update] | ||
| 113 | resource :notifications, only: [:show, :update] | 111 | resource :notifications, only: [:show, :update] |
| 114 | - resource :password, only: [:new, :create] | 112 | + resource :password, only: [:new, :create, :edit, :update] do |
| 113 | + member do | ||
| 114 | + put :reset | ||
| 115 | + end | ||
| 116 | + end | ||
| 115 | resources :keys | 117 | resources :keys |
| 116 | resources :groups, only: [:index] do | 118 | resources :groups, only: [:index] do |
| 117 | member do | 119 | member do |