##// END OF EJS Templates
jro_apps » redmine
RSS
use String#encode at scm_iconv on Ruby 1.9 (#12228)...
use String#encode at scm_iconv on Ruby 1.9 (#12228) Unit git adapter test fails on JRuby 1.7. <pre> Failure: <"test-Ü-2.txt">("UTF-8") expected but was <"test-\xC3\x9C-2.txt">("ASCII-8BIT"). diff: - test-Ü-2.txt ? ^ + test-Ü-2.txt ? ^^ test_entries_latin_1_files(GitAdapterTest) test/unit/lib/redmine/scm/adapters/git_adapter_test.rb:468:in `test_entries_latin_1_files' 465: assert entries1 466: assert_equal 3, entries1.size 467: f1 = entries1[1] => 468: assert_equal "test-#{@char_1}-2.txt", f1.name 469: assert_equal "latin-1-dir/test-#{@char_1}-2.txt", f1.path 470: assert_equal 'file', f1.kind 471: end </pre> git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10740 e93f8b46-1217-0410-a6f0-8f06a7374b81
Toshi MARUYAMA - - Load All Authors

File last commit:

r6449:890807eacc02
r10525:5a2c80cb48c4
Show More
diff.html.erb
27 lines | 1.1 KiB | text/plain | TextLexer
/ app / views / wiki / diff.html.erb
History | Annotation | Raw |Copy content |Copy permalink
<div class="contextual">
<%= link_to(l(:label_history), {:action => 'history', :id => @page.title},
:class => 'icon icon-history') %>
</div>
<%= wiki_page_breadcrumb(@page) %>
<h2><%= h(@page.pretty_title) %></h2>
<p>
<%= l(:label_version) %> <%= link_to @diff.content_from.version, :action => 'show', :id => @page.title, :project_id => @page.project, :version => @diff.content_from.version %>
<em>(<%= @diff.content_from.author ?
@diff.content_from.author.name : l(:label_user_anonymous)
%>, <%= format_time(@diff.content_from.updated_on) %>)</em>
&#8594;
<%= l(:label_version) %> <%= link_to @diff.content_to.version, :action => 'show',
:id => @page.title, :project_id => @page.project,
:version => @diff.content_to.version
%>/<%= @page.content.version %>
<em>(<%= @diff.content_to.author ?
link_to_user(@diff.content_to.author.name) : l(:label_user_anonymous)
%>, <%= format_time(@diff.content_to.updated_on) %>)</em>
</p>
<div class="text-diff">
<%= simple_format_without_paragraph @diff.to_html %>
</div>