Wrap textilizable with DIV containing wiki class (#21663).

Patch by Felix Gliesche.

git-svn-id: http://svn.redmine.org/redmine/trunk@15071 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/views/issues/_conflict.html.erb b/app/views/issues/_conflict.html.erb
index 01d6688211b7570216f3786078120c7295fae3b9..c13ace665eab4262544e3033b02f67a958d6337a 100644 (file)
--- a/app/views/issues/_conflict.html.erb
+++ b/app/views/issues/_conflict.html.erb
@@ -11,7 +11,9 @@
         <% end %>
       </ul>
       <% end %>
-      <%= textilizable(journal, :notes) unless journal.notes.blank? %>
+      <div class="wiki">
+        <%= textilizable(journal, :notes) unless journal.notes.blank? %>
+      </div>
     <% end %>
     </div>
   <% end %>