RedMine Mirror Source

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>

fix JRuby 1.6 tests fail on CI server (#12228)

Merged r10733 from trunk (#12232, #12235)

German translation for 2.1-stable updated by Daniel Felix.

prevent rake task error on JRuby 1.7 (#12228)

Following is "rake db:migrate RAILS_ENV=test" output
on jruby 1.7.0 (1.9.3p203) 2012-10-22 ff1ebbe on OpenJDK Client VM 1.6.0_18-b18 [linux-i386].

<pre>
ArgumentError: file not found: db:migrate
non_options at /xxxxx/rubies/jruby-1.7.0/lib/ruby/1.9/test/unit.rb:167
map! at org/jruby/RubyArray.java:2387
non_options at /xxxxx/rubies/jruby-1.7.0/lib/ruby/1.9/test/unit.rb:146
non_options at /xxxxx/rubies/jruby-1.7.0/lib/ruby/1.9/test/unit.rb:207
process_args at /xxxxx/rubies/jruby-1.7.0/lib/ruby/1.9/test/unit.rb:52
_run at /xxxxx/rubies/jruby-1.7.0/lib/ruby/1.9/minitest/unit.rb:891
run at /xxxxx/rubies/jruby-1.7.0/lib/ruby/1.9/minitest/unit.rb:884
run at /xxxxx/rubies/jruby-1.7.0/lib/ruby/1.9/test/unit.rb:21
autorun at /xxxxx/rubies/jruby-1.7.0/lib/ruby/1.9/test/unit.rb:326
run_once at /xxxxx/rubies/jruby-1.7.0/lib/ruby/1.9/test/unit.rb:27
autorun at /xxxxx/rubies/jruby-1.7.0/lib/ruby/1.9/test/unit.rb:325
</pre>

remove trailing white-space from app/controllers/repositories_controller.rb

German translation enhancements by Daniel Felix (#12232)

German translation for trunk updated by Daniel Felix (#12232)

German translation for 2.1-stable updated by Daniel Felix (#12232, #12235)

Fixed rendering of just uploaded not yet attached files in non-issue preview.

Prevent error when attachment is not pre-loaded.