diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-19 18:09:08 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-19 18:09:08 +0300 |
| commit | 6a3c4476fa8f1c686eadbed05262bce95504ffa7 (patch) | |
| tree | d6e29b8f855e704d560d40df0726ba52e74aebca /app/helpers/git_helper.rb | |
| parent | c6af94ea4ea649171ff930b6bf94c73a5d03edb9 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/git_helper.rb')
| -rw-r--r-- | app/helpers/git_helper.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/helpers/git_helper.rb b/app/helpers/git_helper.rb index 0fb37a69e56..f7c511cdc47 100644 --- a/app/helpers/git_helper.rb +++ b/app/helpers/git_helper.rb @@ -4,8 +4,7 @@ module GitHelper def strip_signature(text) text = text.gsub(/-----BEGIN PGP SIGNATURE-----(.*)-----END PGP SIGNATURE-----/m, "") text = text.gsub(/-----BEGIN PGP MESSAGE-----(.*)-----END PGP MESSAGE-----/m, "") - text = text.gsub(/-----BEGIN SIGNED MESSAGE-----(.*)-----END SIGNED MESSAGE-----/m, "") - text + text.gsub(/-----BEGIN SIGNED MESSAGE-----(.*)-----END SIGNED MESSAGE-----/m, "") end def short_sha(text) |