diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-09 00:07:44 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-09 00:07:44 +0000 |
| commit | 3359a5a56337b93cd34b9914b6468395bfb6c514 (patch) | |
| tree | b4a01c84a076934d942858b36d2a8e016256efb4 /app/helpers/git_helper.rb | |
| parent | f7c17a066a65bef78e2c2c9f4b70cb5ad86007b0 (diff) | |
| download | gitlab-ce-3359a5a56337b93cd34b9914b6468395bfb6c514.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/git_helper.rb')
| -rw-r--r-- | app/helpers/git_helper.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/helpers/git_helper.rb b/app/helpers/git_helper.rb index 03b71522b84..0fb37a69e56 100644 --- a/app/helpers/git_helper.rb +++ b/app/helpers/git_helper.rb @@ -2,9 +2,10 @@ module GitHelper def strip_signature(text) - text.gsub(/-----BEGIN PGP SIGNATURE-----(.*)-----END PGP SIGNATURE-----/m, "") - text.gsub(/-----BEGIN PGP MESSAGE-----(.*)-----END PGP MESSAGE-----/m, "") - text.gsub(/-----BEGIN SIGNED MESSAGE-----(.*)-----END SIGNED MESSAGE-----/m, "") + 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 end def short_sha(text) |