diff options
| author | Marin Jankovski <maxlazio@gmail.com> | 2014-12-30 11:01:30 +0100 |
|---|---|---|
| committer | Marin Jankovski <maxlazio@gmail.com> | 2014-12-30 11:01:30 +0100 |
| commit | 607ea7c6e5663542ae53de66a80f3e8beefe1341 (patch) | |
| tree | 0af61bd7962ab79793f34930851c27d355bfd32e /app/controllers/admin | |
| parent | 82829ed49e11a173275633cad63978e4ee07e927 (diff) | |
| download | gitlab-ce-607ea7c6e5663542ae53de66a80f3e8beefe1341.tar.gz | |
Share the key table between admin and profile resources.
Diffstat (limited to 'app/controllers/admin')
| -rw-r--r-- | app/controllers/admin/users_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb index 86c671ed756..aea8545d38e 100644 --- a/app/controllers/admin/users_controller.rb +++ b/app/controllers/admin/users_controller.rb @@ -11,7 +11,7 @@ class Admin::UsersController < Admin::ApplicationController def show @personal_projects = user.personal_projects @joined_projects = user.projects.joined(@user) - @ssh_keys = user.keys.order('id DESC') + @keys = user.keys.order('id DESC') end def new |