diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-07 03:09:12 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-07 03:09:12 +0300 |
commit | 6168721025dd8e98caeb2bf6844273e6690eaf69 (patch) | |
tree | 8c4fb20d793669e488a739bc9951dab8b363eed4 /lib/gitlab/gpg | |
parent | a89cb5cbdd832d4d9e80517973aceda6bc0a3856 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/gpg')
-rw-r--r-- | lib/gitlab/gpg/commit.rb | 31 |
1 files changed, 2 insertions, 29 deletions
diff --git a/lib/gitlab/gpg/commit.rb b/lib/gitlab/gpg/commit.rb index 800e94e51e8..1abbd6dc45b 100644 --- a/lib/gitlab/gpg/commit.rb +++ b/lib/gitlab/gpg/commit.rb @@ -2,36 +2,9 @@ module Gitlab module Gpg - class Commit - include Gitlab::Utils::StrongMemoize - - def initialize(commit) - @commit = commit - - repo = commit.container.repository.raw_repository - @signature_data = Gitlab::Git::Commit.extract_signature_lazily(repo, commit.sha || commit.id) - - lazy_signature - end - - def signature_text - strong_memoize(:signature_text) do - @signature_data&.itself && @signature_data[0] # rubocop:disable Lint/SafeNavigationConsistency - end - end - - def signed_text - strong_memoize(:signed_text) do - @signature_data&.itself && @signature_data[1] # rubocop:disable Lint/SafeNavigationConsistency - end - end - - def has_signature? - !!(signature_text && signed_text) - end - + class Commit < Gitlab::SignedCommit def signature - return unless has_signature? + super return @signature if @signature |