diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-13 12:15:32 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-13 12:15:32 +0300 |
| commit | 5d0c43f60d96dfa436edd9a248100b935c05edf1 (patch) | |
| tree | 460f7552a41be4f7140b5603601743ba47fcb1f9 /lib/gitlab/gpg | |
| parent | 03d085654717ea2f4a884f9286d56cc9e6381f4e (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/gpg')
| -rw-r--r-- | lib/gitlab/gpg/commit.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/gpg/commit.rb b/lib/gitlab/gpg/commit.rb index 59882e8d4f8..ab7de14b07a 100644 --- a/lib/gitlab/gpg/commit.rb +++ b/lib/gitlab/gpg/commit.rb @@ -102,7 +102,7 @@ module Gitlab end def verification_status(gpg_key) - return :multiple_signatures if multiple_signatures? && Feature.enabled?(:multiple_gpg_signatures, @commit.project, default_enabled: :yaml) + return :multiple_signatures if multiple_signatures? return :unknown_key unless gpg_key return :unverified_key unless gpg_key.verified? return :unverified unless verified_signature&.valid? |