diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2013-09-18 14:22:44 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2013-09-18 14:22:44 +0000 |
| commit | 5aa8358f97d29dcce71bef48089ac7f86550fc62 (patch) | |
| tree | 388227f0d978b492ebe22a03d1202de26d419526 /app | |
| parent | 120689e7cb48eb87d49827eb5ce7f9c12d689aaf (diff) | |
| download | redmine-5aa8358f97d29dcce71bef48089ac7f86550fc62.tar.gz redmine-5aa8358f97d29dcce71bef48089ac7f86550fc62.zip | |
scm: fix annotate error with non ASCII author on Ruby 1.9 and Ruby 2.0 (#14931)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12156 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/repositories/annotate.html.erb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/views/repositories/annotate.html.erb b/app/views/repositories/annotate.html.erb index 210a0c0e5..fcb6d3d84 100644 --- a/app/views/repositories/annotate.html.erb +++ b/app/views/repositories/annotate.html.erb @@ -26,7 +26,9 @@ </td> <td class="author"> <% if revision && revision != previous_revision %> - <%= revision.author.to_s.split('<').first %> + <% author = Redmine::CodesetUtil.to_utf8(revision.author.to_s, + @repository.repo_log_encoding) %> + <%= author.split('<').first %> <% end %> </td> <td class="line-code"><pre><%= line.html_safe %></pre></td> |