diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-02-14 07:35:05 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-02-14 07:35:05 +0000 |
| commit | 205abf220ed832f92d9e19d0bbcd96bffd1fbfb2 (patch) | |
| tree | e9ed4a10e06f7eba224150a643cb87507fc2ddc7 /config | |
| parent | d41e404e09c79394ff1938eee01b56345edc6ed9 (diff) | |
| parent | 29cfd33d949d21d67f3892473c24d4f0a127dfe6 (diff) | |
| download | gitlab-ce-205abf220ed832f92d9e19d0bbcd96bffd1fbfb2.tar.gz | |
Merge branch 'feature/email-aliases' into 'master'
Add email aliases for users
Email aliases are used to associate commits with users. The emails are not verified and don't have to be valid email addresses. They are assigned on a first come, first serve basis.
This addresses http://feedback.gitlab.com/forums/176466-general/suggestions/3692666-ability-to-have-multiple-email-address.
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 |