From df365334d3af111e46590d246e39421cb4aa6808 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 16 Dec 2018 06:38:55 +0000
Subject: [PATCH] Use pre tags for wiki diff (#11359).

Patch by Kouhei Sutou.

git-svn-id: http://svn.redmine.org/redmine/trunk@17742 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/journals/diff.html.erb | 4 +---
 app/views/wiki/diff.html.erb     | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/app/views/journals/diff.html.erb b/app/views/journals/diff.html.erb
index d28ee0f71..c9b019d2b 100644
--- a/app/views/journals/diff.html.erb
+++ b/app/views/journals/diff.html.erb
@@ -1,9 +1,7 @@
 <h2><%= @issue.tracker %> #<%= @issue.id %></h2>
 <p><%= authoring @journal.created_on, @journal.user, :label => :label_updated_time_by %></p>
 
-<div class="text-diff">
-<%= simple_format_without_paragraph @diff.to_html %>
-</div>
+<pre class="text-diff"><%= @diff.to_html %></pre>
 
 <p>
   <%= link_to(l(:button_back), issue_path(@issue),
diff --git a/app/views/wiki/diff.html.erb b/app/views/wiki/diff.html.erb
index 361a6e089..765e51a0a 100644
--- a/app/views/wiki/diff.html.erb
+++ b/app/views/wiki/diff.html.erb
@@ -24,6 +24,4 @@
       %>, <%= format_time(@diff.content_to.updated_on) %>)</em>
 </p>
 
-<div class="text-diff">
-<%= simple_format_without_paragraph @diff.to_html %>
-</div>
+<pre class="text-diff"><%= @diff.to_html %></pre>