meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-02-05 16:43:25 +00:00
Code Issues Releases Wiki Activity

Use pre tags for wiki diff (#11359).

Browse Source 
Patch by Kouhei Sutou.

git-svn-id: http://svn.redmine.org/redmine/trunk@17742 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2018-12-16 06:38:55 +00:00
parent 2452bc0092
commit df365334d3
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/journals/diff.html.erb
View File

@ -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),

4
app/views/wiki/diff.html.erb
View File

@ -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>