Merge commit 'rails/master'

Conflicts:

	activerecord/lib/active_record.rb

1 files changed, 6 insertions, 3 deletions

diff --git a/activerecord/test/models/company_in_module.rb b/activerecord/test/models/company_in_module.rb
index 3c34efbe16..8b84c2fb5e 100644
--- a/activerecord/test/models/company_in_module.rb
+++ b/activerecord/test/models/company_in_module.rb
@@ -54,10 +54,13 @@ module MyApplication
         i.belongs_to :nested_unqualified_billing_firm, :class_name => 'Nested::Firm'
       end
 
+      validate :check_empty_credit_limit
+
       protected
-        def validate
-          errors.add_on_empty "credit_limit"
-        end
+
+      def check_empty_credit_limit
+        errors.add_on_empty "credit_limit"
+      end
     end
   end
 end