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/models/gpg_key.rb | |
parent | 9b4990a4d71b057f0fec14399cd1f2a421901963 (diff) | |
download | gitlab-ce-c73748e3c4409de7ab945f502d55fe4d62ebd5eb.tar.gz |
Render GPG subkeys on index page
Diffstat (limited to 'app/models/gpg_key.rb')
-rw-r--r-- | app/models/gpg_key.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/gpg_key.rb b/app/models/gpg_key.rb index ed09b44027c..e6c862d9b55 100644 --- a/app/models/gpg_key.rb +++ b/app/models/gpg_key.rb @@ -12,6 +12,8 @@ class GpgKey < ActiveRecord::Base has_many :gpg_signatures has_many :subkeys, class_name: 'GpgKeySubkey' + scope :with_subkeys, -> { includes(:subkeys) } + validates :user, presence: true validates :key, |