diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-02-14 12:14:07 +0200 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-02-14 12:14:07 +0200 |
commit | 361a8781c939e96c9718403db5330f389f13e64b (patch) | |
tree | 2cfe1183c88780f1ebb19258bf0596453ee86caf /config | |
parent | 66d21d54f37eddeb4863b7a2b03f8add3ab8aea1 (diff) | |
parent | 205abf220ed832f92d9e19d0bbcd96bffd1fbfb2 (diff) | |
download | gitlab-ce-361a8781c939e96c9718403db5330f389f13e64b.tar.gz |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
Diffstat (limited to 'config')
-rw-r--r-- | config/routes.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/routes.rb b/config/routes.rb index 8c66ad741f9..fdca1e62661 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -124,6 +124,7 @@ Gitlab::Application.routes.draw do end end resources :keys + resources :emails, only: [:index, :create, :destroy] resources :groups, only: [:index] do member do delete :leave |