Merge branch 'hide-gpg-signature' into 'master'

Hide gpg signature Fixes #1743 See merge request !1263

Merge branch 'hide-gpg-signature' into 'master'
0dcc9f39 · Dmitriy Zaporozhets · fe46a5c0 · f9aead9f · 0dcc9f39 · 0dcc9f39
Commit 0dcc9f39 authored Nov 18, 2014 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

git_helper.rb app/helpers/git_helper.rb +5 -0

_tag.html.haml app/views/projects/tags/_tag.html.haml +1 -1

No files found.
--- a/app/helpers/git_helper.rb
+++ b/app/helpers/git_helper.rb
+module GitHelper
+  def strip_gpg_signature(text)
+    text.gsub(/-----BEGIN PGP SIGNATURE-----(.*)-----END PGP SIGNATURE-----/m, "")
+  end
+end
--- a/app/views/projects/tags/_tag.html.haml
+++ b/app/views/projects/tags/_tag.html.haml
@@ -6,7 +6,7 @@
      = tag.name
    - if tag.message.present?
      &nbsp;
-      = tag.message
+      = strip_gpg_signature(tag.message)
    .pull-right
      - if can? current_user, :download_code, @project
        = render 'projects/repositories/download_archive', ref: tag.name, btn_class: 'btn-grouped btn-group-small'