[Git][noosfero/noosfero][master] 2 commits: Makes sidebox's description html safe

[Tallys Martins]

Tallys Martins pushed to branch master at Noosfero / noosfero


Commits:
7859ccfe by Victor Navarro at 2017-03-28T16:25:13-03:00
Makes sidebox's description html safe

Signed-off-by: Vinicius Borges <vbda123 at gmail.com>
Signed-off-by: Victor Navarro <victor.matias.navarro at gmail.com>

- - - - -
9072a73e by Tallys Martins at 2017-05-05T01:37:45+00:00
Merge branch 'html_safe_sidebox' into 'master'

Makes sidebox's description html safe

See merge request !1155
- - - - -


1 changed file:

- app/views/box_organizer/show_block_type_info.html.erb


Changes:

=====================================
app/views/box_organizer/show_block_type_info.html.erb
=====================================
--- a/app/views/box_organizer/show_block_type_info.html.erb
+++ b/app/views/box_organizer/show_block_type_info.html.erb
@@ -14,7 +14,7 @@
 
   <div id="block-info-description">
     <h2><%= _('Description') %></h2>
-    <p><%= @block.class.description %></p>
+    <p><%= @block.class.description.html_safe %></p>
     <p><%= @block.help.html_safe if @block.class.method_defined?(:help) %></p>
   </div>
 



View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/dddd8f13ff1868a98f3c72f0fd729751807bc49a...9072a73e82b62ed8a3c4cbcaecf62630b3c1b1fa

---
View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/dddd8f13ff1868a98f3c72f0fd729751807bc49a...9072a73e82b62ed8a3c4cbcaecf62630b3c1b1fa
You're receiving this email because of your account on gitlab.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20170505/169e6e3f/attachment-0001.html>