summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-11-18 18:00:38 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-11-18 18:00:38 +0200
commitf9aead9f6e7e477236a51fa4eab3a6cba5dd2331 (patch)
treef74c180186499253fa49b658f2500f207a201996
parent435128171ddf41025f410429b8a639a368e77582 (diff)
downloadgitlab-ce-f9aead9f6e7e477236a51fa4eab3a6cba5dd2331.tar.gz
Hide gpg signature on tags page from tag message
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r--app/helpers/git_helper.rb5
-rw-r--r--app/views/projects/tags/_tag.html.haml2
2 files changed, 6 insertions, 1 deletions
diff --git a/app/helpers/git_helper.rb b/app/helpers/git_helper.rb
new file mode 100644
index 00000000000..09684955233
--- /dev/null
+++ b/app/helpers/git_helper.rb
@@ -0,0 +1,5 @@
+module GitHelper
+ def strip_gpg_signature(text)
+ text.gsub(/-----BEGIN PGP SIGNATURE-----(.*)-----END PGP SIGNATURE-----/m, "")
+ end
+end
diff --git a/app/views/projects/tags/_tag.html.haml b/app/views/projects/tags/_tag.html.haml
index f93c1b4211f..4ab102ba96c 100644
--- 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'