Merged rails-3.2 branch.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9528 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-25 17:17:49 +00:00
parent 34e20c4373
commit 5e57a1a9d9
457 changed files with 20215 additions and 5352 deletions
@@ -57,7 +57,7 @@ class Repository < ActiveRecord::Base
  end

  alias :attributes_without_extra_info= :attributes=
-  def attributes=(new_attributes, guard_protected_attributes = true)
+  def attributes=(new_attributes)
    return if new_attributes.nil?
    attributes = new_attributes.dup
    attributes.stringify_keys!
@@ -72,7 +72,7 @@ class Repository < ActiveRecord::Base
      end
    end

-    send :attributes_without_extra_info=, p, guard_protected_attributes
+    send :attributes_without_extra_info=, p
    if p_extra.keys.any?
      merge_extra_info(p_extra)
    end