summaryrefslogtreecommitdiff
path: root/app/models/gpg_key.rb
diff options
context:
space:
mode:
authorRubén Dávila <ruben@gitlab.com>2017-10-01 21:50:38 -0500
committerRubén Dávila <ruben@gitlab.com>2017-10-05 08:25:28 -0500
commit85c6652a387276ca58b900fa34948cf3cba489a5 (patch)
treef9fd72f205bdb620dadd89b2d8fcf053dabb926e /app/models/gpg_key.rb
parentc50725fecfb776d56c95ef070940ca6c85786ecf (diff)
downloadgitlab-ce-85c6652a387276ca58b900fa34948cf3cba489a5.tar.gz
Fix some broken specs
Diffstat (limited to 'app/models/gpg_key.rb')
-rw-r--r--app/models/gpg_key.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/gpg_key.rb b/app/models/gpg_key.rb
index 27513f4b03f..145b957fc88 100644
--- a/app/models/gpg_key.rb
+++ b/app/models/gpg_key.rb
@@ -119,7 +119,7 @@ class GpgKey < ActiveRecord::Base
def generate_subkeys
gpg_subkeys = Gitlab::Gpg.subkeys_from_key(key)
- gpg_subkeys[primary_keyid].each do |subkey_data|
+ gpg_subkeys[primary_keyid]&.each do |subkey_data|
subkeys.create!(keyid: subkey_data[:keyid], fingerprint: subkey_data[:fingerprint])
end
end