Mercurial > hg > soundsoftware-site
annotate app/views/journals/diff.html.erb @ 1485:c8d3ad483bea redmine-2.4-integration
Fix stray merge markers
| author | Chris Cannam <chris.cannam@soundsoftware.ac.uk> |
|---|---|
| date | Wed, 15 Jan 2014 13:34:12 +0000 |
| parents | 261b3d9a4903 |
| children |
| rev | line source |
|---|---|
| Chris@1464 | 1 <h2><%= @issue.tracker %> #<%= @issue.id %></h2> |
| Chris@245 | 2 <p><%= authoring @journal.created_on, @journal.user, :label => :label_updated_time_by %></p> |
| Chris@245 | 3 |
| Chris@245 | 4 <div class="text-diff"> |
| Chris@245 | 5 <%= simple_format_without_paragraph @diff.to_html %> |
| Chris@245 | 6 </div> |
| Chris@245 | 7 |
| Chris@1464 | 8 <p> |
| Chris@1464 | 9 <%= link_to(l(:button_back), issue_path(@issue), |
| Chris@1464 | 10 :onclick => 'if (document.referrer != "") {history.back(); return false;}') %> |
| Chris@1464 | 11 </p> |
| Chris@245 | 12 |
| Chris@245 | 13 <% html_title "#{@issue.tracker.name} ##{@issue.id}: #{@issue.subject}" %> |