Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRubén Dávila <ruben@gitlab.com>2017-09-28 04:45:08 +0300
committerRubén Dávila <ruben@gitlab.com>2017-10-05 16:25:27 +0300
commitc73748e3c4409de7ab945f502d55fe4d62ebd5eb (patch)
tree5b6d985f0ae70a7f02a762cde8ac2a28d5f4e8b0 /app/controllers
parent9b4990a4d71b057f0fec14399cd1f2a421901963 (diff)
Render GPG subkeys on index page
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/profiles/gpg_keys_controller.rb2
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