Merge branch 'legislation-module-stable' into 107-social-share-for-annotations

2017-02-14 18:14:00 +01:00
parent af52fb5670 9478ca3b60
commit 2efa72ddd5
25 changed files with 328 additions and 108 deletions
--- a/app/views/legislation/annotations/show.html.erb
+++ b/app/views/legislation/annotations/show.html.erb
@@ -15,7 +15,7 @@
          <div class="comment-section">
            <div class="row">
              <div class="small-12 medium-10 column legislation-comment">
-                <%= @annotation.quote %>
+                <%= @annotation.context.try(:html_safe).presence || @annotation.quote %>
              </div>
              <div class="small-12 medium-2 column legislation-comment">
                <span class="pull-right">