summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2010-02-14 15:57:56 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2010-02-14 15:57:56 +0000
commit864fd9c6a101a394fe255ae3fd35d14e90128eaf (patch)
treee342f1476fbf938215be7c0880015277dae89926
parent57dcbd73767acdcf61d8a3dc65d5bbda4e3a5636 (diff)
downloadredmine-864fd9c6a101a394fe255ae3fd35d14e90128eaf.tar.gz
redmine-864fd9c6a101a394fe255ae3fd35d14e90128eaf.zip
Merged bug fixes r3423 and r3427.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/0.9-stable@3433 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/models/issue.rb3
-rw-r--r--doc/INSTALL6
2 files changed, 7 insertions, 2 deletions
diff --git a/app/models/issue.rb b/app/models/issue.rb
index f4ebb2936..725d7dafc 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -159,7 +159,8 @@ class Issue < ActiveRecord::Base
end
send :attributes_without_tracker_first=, new_attributes, *args
end
- alias_method_chain :attributes=, :tracker_first
+ # Do not redefine alias chain on reload (see #4838)
+ alias_method_chain(:attributes=, :tracker_first) unless method_defined?(:attributes_without_tracker_first=)
def estimated_hours=(h)
write_attribute :estimated_hours, (h.is_a?(String) ? h.to_hours : h)
diff --git a/doc/INSTALL b/doc/INSTALL
index 97d9d6080..1f3104644 100644
--- a/doc/INSTALL
+++ b/doc/INSTALL
@@ -7,7 +7,11 @@ http://www.redmine.org/
== Requirements
-* Ruby on Rails 2.3.5
+* Ruby 1.8.6 or 1.8.7
+
+* Ruby on Rails 2.3.5 (official downloadable Redmine releases are packaged with
+ the appropriate Rails version)
+
* A database:
* MySQL (tested with MySQL 5)
* PostgreSQL (tested with PostgreSQL 8.1)