diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2017-10-06 18:27:15 +0300 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2017-10-06 18:27:15 +0300 |
| commit | 830c770a532fc94e1b1a70064500c9bd63712de4 (patch) | |
| tree | 140141b7c9ac92cdce29e71b6da6f00bcde9f51a /app/controllers | |
| parent | 3e26b0dcd113ade77dc8304137c6733cab4c8718 (diff) | |
| parent | 7f8e720f415ff50f791d9efd49b774c9da9ab109 (diff) | |
Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
Diffstat (limited to 'app/controllers')
| -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 |