diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-11-14 11:41:52 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-11-14 11:41:52 +0300 |
commit | 585826cb22ecea5998a2c2a4675735c94bdeedac (patch) | |
tree | 5b05f0b30d33cef48963609e8a18a4dff260eab3 /app/models/commit.rb | |
parent | df221d036e5d0c6c0ee4d55b9c97f481ee05dee8 (diff) |
Add latest changes from gitlab-org/gitlab@16-6-stable-eev16.6.0-rc42
Diffstat (limited to 'app/models/commit.rb')
-rw-r--r-- | app/models/commit.rb | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/app/models/commit.rb b/app/models/commit.rb index 39e12b53f21..886e6e9fbd7 100644 --- a/app/models/commit.rb +++ b/app/models/commit.rb @@ -372,9 +372,7 @@ class Commit strong_memoize(:raw_signature_type) do next unless @raw.instance_of?(Gitlab::Git::Commit) - if raw_commit_from_rugged? && gpg_commit.signature_text.present? - :PGP - elsif defined? @raw.raw_commit.signature_type + if defined? @raw.raw_commit.signature_type @raw.raw_commit.signature_type end end @@ -397,10 +395,6 @@ class Commit end end - def raw_commit_from_rugged? - @raw.raw_commit.is_a?(Rugged::Commit) - end - def gpg_commit @gpg_commit ||= Gitlab::Gpg::Commit.new(self) end |