diff options
| author | Rubén Dávila <ruben@gitlab.com> | 2017-09-27 20:45:08 -0500 |
|---|---|---|
| committer | Rubén Dávila <ruben@gitlab.com> | 2017-10-05 08:25:27 -0500 |
| commit | c73748e3c4409de7ab945f502d55fe4d62ebd5eb (patch) | |
| tree | 5b6d985f0ae70a7f02a762cde8ac2a28d5f4e8b0 /app/controllers/profiles | |
| parent | 9b4990a4d71b057f0fec14399cd1f2a421901963 (diff) | |
| download | gitlab-ce-c73748e3c4409de7ab945f502d55fe4d62ebd5eb.tar.gz | |
Render GPG subkeys on index page
Diffstat (limited to 'app/controllers/profiles')
| -rw-r--r-- | app/controllers/profiles/gpg_keys_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/profiles/gpg_keys_controller.rb b/app/controllers/profiles/gpg_keys_controller.rb index 689c76059f6..38e3eacd229 100644 --- a/app/controllers/profiles/gpg_keys_controller.rb +++ b/app/controllers/profiles/gpg_keys_controller.rb @@ -2,7 +2,7 @@ class Profiles::GpgKeysController < Profiles::ApplicationController before_action :set_gpg_key, only: [:destroy, :revoke] def index - @gpg_keys = current_user.gpg_keys + @gpg_keys = current_user.gpg_keys.with_subkeys @gpg_key = GpgKey.new end |