From: Toshi MARUYAMA Date: Thu, 23 Feb 2012 10:11:19 +0000 (+0000) Subject: scm: use to_s for revision in find_changeset_by_name method X-Git-Tag: 1.4.0~383 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a26100666600dbef1077ee3f651550f50979fba9;p=redmine.git scm: use to_s for revision in find_changeset_by_name method On Rails 3.0.11, Subversion functional test fails.
Error: test_directory_diff(RepositoriesSubversionControllerTest)
NoMethodError: undefined method `match' for 2:Fixnum
app/models/repository.rb:234:in `find_changeset_by_name'
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8931 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/app/models/repository.rb b/app/models/repository.rb index 8ad339970..290664600 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -231,8 +231,9 @@ class Repository < ActiveRecord::Base # Finds and returns a revision with a number or the beginning of a hash def find_changeset_by_name(name) return nil if name.blank? - changesets.find(:first, :conditions => (name.match(/^\d*$/) ? - ["revision = ?", name.to_s] : ["revision LIKE ?", name + '%'])) + s = name.to_s + changesets.find(:first, :conditions => (s.match(/^\d*$/) ? + ["revision = ?", s] : ["revision LIKE ?", s + '%'])) end def latest_changeset