summaryrefslogtreecommitdiffstats
path: root/app/models/changeset.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/changeset.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/changeset.rb')
-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 d795524a8..dbab9feac 100644
--- a/app/models/changeset.rb
+++ b/app/models/changeset.rb
@@ -20,7 +20,7 @@ require 'iconv'
class Changeset < ActiveRecord::Base
belongs_to :repository
belongs_to :user
- has_many :changes, :dependent => :delete_all
+ has_many :filechanges, :class_name => 'Change', :dependent => :delete_all
has_and_belongs_to_many :issues
has_and_belongs_to_many :parents,
:class_name => "Changeset",