fix association :extend option

1 files changed, 2 insertions, 6 deletions

diff --git a/activerecord/lib/active_record/associations/association_scope.rb b/activerecord/lib/active_record/associations/association_scope.rb
index 1c06fb2681..1303822868 100644
--- a/activerecord/lib/active_record/associations/association_scope.rb
+++ b/activerecord/lib/active_record/associations/association_scope.rb
@@ -15,9 +15,7 @@ module ActiveRecord
 
       def scope
         scope = klass.unscoped
-        scope.extending!(*Array(options[:extend]))
         scope.merge! eval_scope(klass, reflection.scope) if reflection.scope
-
         add_constraints(scope)
       end
 
@@ -120,10 +118,8 @@ module ActiveRecord
       end
 
       def eval_scope(klass, scope)
-        return scope if scope.is_a?(Relation)
-
-        if scope.arity == 0
-          klass.unscoped.instance_exec(&scope)
+        if scope.is_a?(Relation)
+          scope
         else
           klass.unscoped.instance_exec(owner, &scope)
         end