summaryrefslogtreecommitdiff
path: root/spec/features/commits_spec.rb
diff options
context:
space:
mode:
authorAlexis Reigel <mail@koffeinfrei.org>2017-06-13 13:46:43 +0200
committerAlexis Reigel <mail@koffeinfrei.org>2017-07-27 15:42:53 +0200
commit3c42d730986222d891c9b7985edf3942021afcef (patch)
tree4631a62e7cbfba445e8cf6b89f9b5e6582aa4cc3 /spec/features/commits_spec.rb
parent7e13d96715750f74db399bf40ee4ec9679bbe806 (diff)
downloadgitlab-ce-3c42d730986222d891c9b7985edf3942021afcef.tar.gz
add primary keyid attribute to gpg keys
Diffstat (limited to 'spec/features/commits_spec.rb')
-rw-r--r--spec/features/commits_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/features/commits_spec.rb b/spec/features/commits_spec.rb
index 79952eda2ff..1dbcf09d4a0 100644
--- a/spec/features/commits_spec.rb
+++ b/spec/features/commits_spec.rb
@@ -220,8 +220,8 @@ describe 'Commits' do
Dir.mktmpdir do |dir|
FileUtils.cd dir do
`git clone --quiet #{remote_path} .`
- `git commit --quiet -S#{GpgHelpers::User1.key_id} --allow-empty -m "signed commit, verified key/email"`
- `git commit --quiet -S#{GpgHelpers::User2.key_id} --allow-empty -m "signed commit, unverified key/email"`
+ `git commit --quiet -S#{GpgHelpers::User1.primary_keyid} --allow-empty -m "signed commit, verified key/email"`
+ `git commit --quiet -S#{GpgHelpers::User2.primary_keyid} --allow-empty -m "signed commit, unverified key/email"`
`git push --quiet`
end
end