summaryrefslogtreecommitdiffstats
path: root/app/models/repository/darcs.rb
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2012-06-03 11:46:58 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2012-06-03 11:46:58 +0000
commit2cbf9c9cc48135019dae50ccc5d9b07a44af8325 (patch)
treea191f37eca9f1cd62ad15c8fa04af319d8068d6b /app/models/repository/darcs.rb
parentdd9c2cafa795ec00875981dcedd3287d2d005457 (diff)
downloadredmine-2cbf9c9cc48135019dae50ccc5d9b07a44af8325.tar.gz
redmine-2cbf9c9cc48135019dae50ccc5d9b07a44af8325.zip
Renamed #changes association to #filechanges (clash with AR::Base.changes that triggers errors with Rails 3.2.5).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9759 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models/repository/darcs.rb')
-rw-r--r--app/models/repository/darcs.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/repository/darcs.rb b/app/models/repository/darcs.rb
index 220121153..18eb3a2f7 100644
--- a/app/models/repository/darcs.rb
+++ b/app/models/repository/darcs.rb
@@ -79,7 +79,7 @@ class Repository::Darcs < Repository
return nil if patch_from.nil?
patch_to = changesets.find_by_revision(rev_to) if rev_to
if path.blank?
- path = patch_from.changes.collect{|change| change.path}.join(' ')
+ path = patch_from.filechanges.collect{|change| change.path}.join(' ')
end
patch_from ? scm.diff(path, patch_from.scmid, patch_to ? patch_to.scmid : nil) : nil
end