From 15067de1afd78833b637be019b350d9d59db4b3c Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Fri, 20 Mar 2015 10:47:28 +0000 Subject: [PATCH] Merged r14136 from trunk to 3.0-stable. revert r13896 (#14534) git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14145 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/changeset.rb | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/app/models/changeset.rb b/app/models/changeset.rb index c03296451..499191070 100644 --- a/app/models/changeset.rb +++ b/app/models/changeset.rb @@ -69,16 +69,6 @@ class Changeset < ActiveRecord::Base end end - def committer=(arg) - write_attribute :committer, - self.class.to_utf8(arg, repository.try(:repo_log_encoding)) - end - - def comments=(arg) - write_attribute :comments, - self.class.normalize_comments(arg, repository.try(:repo_log_encoding)) - end - def committed_on=(date) self.commit_date = date super @@ -102,7 +92,9 @@ class Changeset < ActiveRecord::Base end def before_create_cs - self.comments ||= '' + self.committer = self.class.to_utf8(self.committer, repository.repo_log_encoding) + self.comments = self.class.normalize_comments( + self.comments, repository.repo_log_encoding) self.user = repository.find_committer_user(self.committer) end -- 2.39.5