summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2012-10-28 07:12:23 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2012-10-28 07:12:23 +0000
commit123d2b318f18b6115ff1225dd9017add51c7f234 (patch)
tree5aab2777c9ede8acb71c15558bf49a90ac6221e3 /lib
parent5a2c80cb48c4e876f93f0ed867dd8ec7afc0e008 (diff)
downloadredmine-123d2b318f18b6115ff1225dd9017add51c7f234.tar.gz
redmine-123d2b318f18b6115ff1225dd9017add51c7f234.zip
fix scm_iconv local variable name (#12228)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10741 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib')
-rw-r--r--lib/redmine/scm/adapters/abstract_adapter.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/redmine/scm/adapters/abstract_adapter.rb b/lib/redmine/scm/adapters/abstract_adapter.rb
index c15965595..28f5f16f8 100644
--- a/lib/redmine/scm/adapters/abstract_adapter.rb
+++ b/lib/redmine/scm/adapters/abstract_adapter.rb
@@ -264,7 +264,7 @@ module Redmine
str.force_encoding(from)
begin
s = str.encode(to)
- rescue Exception => e
+ rescue Exception => err
logger.error("failed to convert from #{from} to #{to}. #{err}")
nil
end