diff options
| author | Robert Speicher <robert@gitlab.com> | 2015-12-21 17:58:20 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2015-12-21 17:58:20 +0000 |
| commit | f4c05ee45fda4ee2c76f4cbecb0dc6a1f80d2e83 (patch) | |
| tree | 40073382c03ac6623133a6b8cb374014b838e048 /config | |
| parent | 12b6bf5c57588b011fd711023bf48eeabea02793 (diff) | |
| parent | 577448ab6ab35abbf0263bf8677dfde6d9770c3f (diff) | |
| download | gitlab-ce-f4c05ee45fda4ee2c76f4cbecb0dc6a1f80d2e83.tar.gz | |
Merge branch 'admin_add_identity' into 'master'
Allow admin to create new user identities
Fixes #2442
See merge request !2077
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/routes.rb b/config/routes.rb index 57be57e3251..b9242327de1 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -188,7 +188,7 @@ Rails.application.routes.draw do namespace :admin do resources :users, constraints: { id: /[a-zA-Z.\/0-9_\-]+/ } do resources :keys, only: [:show, :destroy] - resources :identities, only: [:index, :edit, :update, :destroy] + resources :identities, except: [:show] delete 'stop_impersonation' => 'impersonation#destroy', on: :collection |