summaryrefslogtreecommitdiff
path: root/spec/lib/gitlab/gpg
diff options
context:
space:
mode:
authorAlexis Reigel <mail@koffeinfrei.org>2017-06-15 12:43:04 +0200
committerAlexis Reigel <mail@koffeinfrei.org>2017-07-27 15:42:53 +0200
commit5d5fd4babe4cb75c7f8f9f18cc86c63a0fa58d16 (patch)
tree928b5582a8119277bc61605175399820e555a374 /spec/lib/gitlab/gpg
parent34810acd6c3d4dd27f43f6f07e47b4e06bb95f82 (diff)
downloadgitlab-ce-5d5fd4babe4cb75c7f8f9f18cc86c63a0fa58d16.tar.gz
store gpg_key_primary_keyid for unknown gpg keys
we need to store the keyid to be able to update the signature later in case the missing key is added later.
Diffstat (limited to 'spec/lib/gitlab/gpg')
-rw-r--r--spec/lib/gitlab/gpg/commit_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/lib/gitlab/gpg/commit_spec.rb b/spec/lib/gitlab/gpg/commit_spec.rb
index 539e6d4641f..448b16a656e 100644
--- a/spec/lib/gitlab/gpg/commit_spec.rb
+++ b/spec/lib/gitlab/gpg/commit_spec.rb
@@ -100,7 +100,7 @@ RSpec.describe Gitlab::Gpg::Commit do
commit_sha: '0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33',
project: project,
gpg_key: nil,
- gpg_key_primary_keyid: nil,
+ gpg_key_primary_keyid: GpgHelpers::User1.primary_keyid,
valid_signature: false
)
end