diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-10-10 04:58:17 +0000 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-10-10 04:58:17 +0000 |
commit | 1935b494f6716d8410eaf8da59eb11c7f920b80c (patch) | |
tree | 7e57ddeff5d0bc50780e8b9d3be2e6c37ee98acf /config | |
parent | f89a74718a0297c0be5732e829d137f1d118f5f2 (diff) | |
parent | dd68e37db36de31da256be0f9167469b9918a909 (diff) | |
download | gitlab-ce-1935b494f6716d8410eaf8da59eb11c7f920b80c.tar.gz |
Merge branch 'refactor/profile_account' of /home/git/repositories/gitlab/gitlabhq
Diffstat (limited to 'config')
-rw-r--r-- | config/routes.rb | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/config/routes.rb b/config/routes.rb index 612a7327ec5..6d7358608ea 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -99,19 +99,21 @@ Gitlab::Application.routes.draw do # resource :profile, only: [:show, :update] do member do - get :account get :history - get :token get :design - put :update_password put :reset_private_token put :update_username end scope module: :profiles do + resource :account, only: [:show, :update] resource :notifications, only: [:show, :update] - resource :password, only: [:new, :create] + resource :password, only: [:new, :create, :edit, :update] do + member do + put :reset + end + end resources :keys resources :groups, only: [:index] do member do |