Merge remote branch 'mainstream/master'

Conflicts:
	actionpack/lib/action_controller/metal/flash.rb

3 files changed, 16 insertions, 3 deletions

diff --git a/activemodel/test/models/custom_reader.rb b/activemodel/test/models/custom_reader.rb
index 7ac70e6167..14a8be9ebc 100644
--- a/activemodel/test/models/custom_reader.rb
+++ b/activemodel/test/models/custom_reader.rb
@@ -8,8 +8,6 @@ class CustomReader
   def []=(key, value)
     @data[key] = value
   end
-
-  private
   
   def read_attribute_for_validation(key)
     @data[key]
diff --git a/activemodel/test/models/person.rb b/activemodel/test/models/person.rb
index c83d768379..cf16a38618 100644
--- a/activemodel/test/models/person.rb
+++ b/activemodel/test/models/person.rb
@@ -2,7 +2,11 @@ class Person
   include ActiveModel::Validations
   extend  ActiveModel::Translation
 
-  attr_accessor :title, :karma, :salary
+  attr_accessor :title, :karma, :salary, :gender
+
+  def condition_is_true
+    true
+  end
 end
 
 class Child < Person
diff --git a/activemodel/test/models/person_with_validator.rb b/activemodel/test/models/person_with_validator.rb
new file mode 100644
index 0000000000..f9763ea853
--- /dev/null
+++ b/activemodel/test/models/person_with_validator.rb
@@ -0,0 +1,11 @@
+class PersonWithValidator
+  include ActiveModel::Validations
+  
+  class PresenceValidator < ActiveModel::EachValidator
+    def validate_each(record, attribute, value)
+      record.errors[attribute] << "Local validator#{options[:custom]}" if value.blank?
+    end
+  end
+
+  attr_accessor :title, :karma
+end