From 46cbe5418947ab58c919432b9013252ada6a3bc3 Mon Sep 17 00:00:00 2001 From: Saito Date: Mon, 28 Nov 2011 17:46:41 +0800 Subject: fix the issue on github #157. directly force_encoding is wrong, must detect the file string's encoding. then force_encoding the string to it's encoding. last convert it to utf-8. --- app/models/commit.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'app/models/commit.rb') diff --git a/app/models/commit.rb b/app/models/commit.rb index 6d724bc825d..0884e34225c 100644 --- a/app/models/commit.rb +++ b/app/models/commit.rb @@ -1,4 +1,6 @@ class Commit + include Utils::CharEncode + attr_accessor :commit attr_accessor :head @@ -20,7 +22,7 @@ class Commit end def safe_message - message.force_encoding(Encoding::UTF_8) + encode(message) end def created_at @@ -28,10 +30,10 @@ class Commit end def author_email - author.email.force_encoding(Encoding::UTF_8) + encode(author.email) end def author_name - author.name.force_encoding(Encoding::UTF_8) + encode(author.name) end end -- cgit v1.2.1