diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2014-12-30 12:02:16 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2014-12-30 12:02:16 +0000 |
| commit | 0991d19c0d157025db8e9bf01d216771a4dbfe31 (patch) | |
| tree | 996b03f5a726dc81a96405114cda84ba341d0bb5 /config | |
| parent | 394e2ec50b066b5e911b749aa13192ab50e703d4 (diff) | |
| parent | eb29648bf4a9b2ad960a582eba0a51f088afa78f (diff) | |
| download | gitlab-ce-0991d19c0d157025db8e9bf01d216771a4dbfe31.tar.gz | |
Merge branch 'user_ssh_keys_on_admin' into 'master'
User ssh keys on admin
Show user ssh keys on admin user page.
See merge request !1362
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 ff67acb9b10..d36540024aa 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -80,6 +80,7 @@ Gitlab::Application.routes.draw do # namespace :admin do resources :users, constraints: { id: /[a-zA-Z.\/0-9_\-]+/ } do + resources :keys, only: [:show, :destroy] member do put :team_update put :block |