aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--activerecord/lib/active_record/validations.rb5
-rw-r--r--activerecord/lib/active_record/validations/associated.rb (renamed from activemodel/lib/active_model/validations/associated.rb)2
-rw-r--r--activerecord/lib/active_record/validations/uniqueness.rb (renamed from activemodel/lib/active_model/validations/uniqueness.rb)2
3 files changed, 7 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/validations.rb b/activerecord/lib/active_record/validations.rb
index a7043516a7..c6a950d093 100644
--- a/activerecord/lib/active_record/validations.rb
+++ b/activerecord/lib/active_record/validations.rb
@@ -65,3 +65,8 @@ module ActiveRecord
end
end
end
+
+Dir[File.dirname(__FILE__) + "/validations/*.rb"].sort.each do |path|
+ filename = File.basename(path)
+ require "active_record/validations/#{filename}"
+end
diff --git a/activemodel/lib/active_model/validations/associated.rb b/activerecord/lib/active_record/validations/associated.rb
index ba4af5d66d..1d7df6b771 100644
--- a/activemodel/lib/active_model/validations/associated.rb
+++ b/activerecord/lib/active_record/validations/associated.rb
@@ -1,4 +1,4 @@
-module ActiveModel
+module ActiveRecord
module Validations
module ClassMethods
# Validates whether the associated object or objects are all valid themselves. Works with any kind of association.
diff --git a/activemodel/lib/active_model/validations/uniqueness.rb b/activerecord/lib/active_record/validations/uniqueness.rb
index 37beac863f..edec4e9e43 100644
--- a/activemodel/lib/active_model/validations/uniqueness.rb
+++ b/activerecord/lib/active_record/validations/uniqueness.rb
@@ -1,4 +1,4 @@
-module ActiveModel
+module ActiveRecord
module Validations
module ClassMethods
# Validates whether the value of the specified attributes are unique across the system. Useful for making sure that only one user