Add latest changes from gitlab-org/gitlab@master

c1e135e7 · GitLab Bot · ce14080c · c1e135e7 · c1e135e7
Commit c1e135e7 authored 5 years ago by GitLab Bot
--- 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

--- a/spec/support/helpers/gpg_helpers.rb
+++ b/spec/support/helpers/gpg_helpers.rb