diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-18 19:00:14 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-18 19:00:14 +0000 |
| commit | 05f0ebba3a2c8ddf39e436f412dc2ab5bf1353b2 (patch) | |
| tree | 11d0f2a6ec31c7793c184106cedc2ded3d9a2cc5 /app/services/git/branch_hooks_service.rb | |
| parent | ec73467c23693d0db63a797d10194da9e72a74af (diff) | |
| download | gitlab-ce-05f0ebba3a2c8ddf39e436f412dc2ab5bf1353b2.tar.gz | |
Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42
Diffstat (limited to 'app/services/git/branch_hooks_service.rb')
| -rw-r--r-- | app/services/git/branch_hooks_service.rb | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/app/services/git/branch_hooks_service.rb b/app/services/git/branch_hooks_service.rb index 71dd9501648..6087efce9fd 100644 --- a/app/services/git/branch_hooks_service.rb +++ b/app/services/git/branch_hooks_service.rb @@ -165,14 +165,11 @@ module Git end def signature_types - types = [ + [ ::CommitSignatures::GpgSignature, - ::CommitSignatures::X509CommitSignature + ::CommitSignatures::X509CommitSignature, + ::CommitSignatures::SshSignature ] - - types.push(::CommitSignatures::SshSignature) if Feature.enabled?(:ssh_commit_signatures, project) - - types end def unsigned_commit_shas(commits) |