summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-02-14 12:14:07 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-02-14 12:14:07 +0200
commit361a8781c939e96c9718403db5330f389f13e64b (patch)
tree2cfe1183c88780f1ebb19258bf0596453ee86caf /config
parent66d21d54f37eddeb4863b7a2b03f8add3ab8aea1 (diff)
parent205abf220ed832f92d9e19d0bbcd96bffd1fbfb2 (diff)
downloadgitlab-ce-361a8781c939e96c9718403db5330f389f13e64b.tar.gz
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
Diffstat (limited to 'config')
-rw-r--r--config/routes.rb1
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