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

diff --git a/app/models/issue.rb b/app/models/issue.rb
index f4ebb29367ba34c2bb4c2bdbc8d422ee5a199a29..725d7dafcf1ccd9eb525fd855cc1c64fcc425a66 100644 (file)
--- 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 97d9d6080fc74a4f2e24f50c16887d006faaea35..1f3104644b93208be930ae0d3884dba743514fc1 100644 (file)
--- 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)