diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-29 18:06:20 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-29 18:06:20 +0300 |
| commit | c1e135e7033b626c2bce65a900a5b0e669c2f6c2 (patch) | |
| tree | 16d8e9a8b6f98c01dd4722fa22145b76c0b041d1 /spec/lib/gitlab/gpg | |
| parent | ce14080c6ff88bc1957c4edd31876ad3a661f6c3 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib/gitlab/gpg')
| -rw-r--r-- | spec/lib/gitlab/gpg/commit_spec.rb | 2 |
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 a3d7e42733d..fa47cfd519b 100644 --- a/spec/lib/gitlab/gpg/commit_spec.rb +++ b/spec/lib/gitlab/gpg/commit_spec.rb @@ -202,7 +202,7 @@ describe Gitlab::Gpg::Commit do end let(:gpg_key_subkey) do - gpg_key.subkeys.find_by(fingerprint: '0522DD29B98F167CD8421752E38FFCAF75ABD92A') + gpg_key.subkeys.find_by(fingerprint: GpgHelpers::User3.subkey_fingerprints.last) end before do |