From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 26 Feb 2012 13:05:19 +0000 (+0000)
Subject: Rails 3.1 compatibility (order declared on association takes precedence).
X-Git-Tag: 1.4.0~299
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ad2036aabaf45703bf74194e204ea76a9033a742;p=redmine.git

Rails 3.1 compatibility (order declared on association takes precedence).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9015 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/models/repository/cvs.rb b/app/models/repository/cvs.rb
index bb002d38d..db1f6352c 100644
--- a/app/models/repository/cvs.rb
+++ b/app/models/repository/cvs.rb
@@ -181,10 +181,9 @@ class Repository::Cvs < Repository
       end
 
       # Renumber new changesets in chronological order
-      changesets.find(
-              :all,
+      Changeset.all(
               :order => 'committed_on ASC, id ASC',
-              :conditions => "revision LIKE 'tmp%'"
+              :conditions => ["repository_id = ? AND revision LIKE 'tmp%'", id]
            ).each do |changeset|
         changeset.update_attribute :revision, next_revision_number
       end