summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-10-04 10:55:32 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-10-04 10:55:32 +0000
commit48136727280f38468c77924c0fa304b2add9737e (patch)
tree6d0652fee735e202a0ec3afaa207b8044a54d452
parentade5409310e4a532304741229bdbbc2573520515 (diff)
downloadredmine-48136727280f38468c77924c0fa304b2add9737e.tar.gz
redmine-48136727280f38468c77924c0fa304b2add9737e.zip
Merged r7571 from trunk.
Fix typo of fix_issue() at Changeset model. Contributed by Sylvain Utard. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7572 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/models/changeset.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/changeset.rb b/app/models/changeset.rb
index 60ab87864..2bf58e7dc 100644
--- a/app/models/changeset.rb
+++ b/app/models/changeset.rb
@@ -193,7 +193,7 @@ class Changeset < ActiveRecord::Base
def fix_issue(issue)
status = IssueStatus.find_by_id(Setting.commit_fix_status_id.to_i)
if status.nil?
- logger.warn("No status macthes commit_fix_status_id setting (#{Setting.commit_fix_status_id})") if logger
+ logger.warn("No status matches commit_fix_status_id setting (#{Setting.commit_fix_status_id})") if logger
return issue
end