aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/base.rb
diff options
context:
space:
mode:
Diffstat (limited to 'activerecord/lib/active_record/base.rb')
-rw-r--r--activerecord/lib/active_record/base.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index 819c616927..b479c403a7 100644
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -686,7 +686,6 @@ module ActiveRecord #:nodoc:
extend Translation
include Inheritance
include Scoping
- include DefaultScope
extend DynamicMatchers
include Sanitization
include Integration
@@ -697,7 +696,7 @@ module ActiveRecord #:nodoc:
include Locking::Optimistic, Locking::Pessimistic
include AttributeMethods
include Callbacks, ActiveModel::Observing, Timestamp
- include Associations, NamedScope
+ include Associations
include IdentityMap
include ActiveModel::SecurePassword
include Explain