Break up DependencyModule's dual function of providing a "depend_on" DSL and "included" block DSL into separate modules. But, unify both approaches under AS::Concern.

1 files changed, 1 insertions, 11 deletions

diff --git a/activesupport/lib/active_support/dependency_module.rb b/activesupport/lib/active_support/dependency_module.rb
index 9872b9654b..6847c0f86a 100644
--- a/activesupport/lib/active_support/dependency_module.rb
+++ b/activesupport/lib/active_support/dependency_module.rb
@@ -1,19 +1,9 @@
 module ActiveSupport
   module DependencyModule
     def append_features(base)
-      return if base < self
+      return false if base < self
       (@_dependencies ||= []).each { |dep| base.send(:include, dep) }
       super
-      base.extend const_get("ClassMethods") if const_defined?("ClassMethods")
-      base.class_eval(&@_included_block) if instance_variable_defined?("@_included_block")
-    end
-
-    def included(base = nil, &block)
-      if base.nil?
-        @_included_block = block
-      else
-        super
-      end
     end
 
     def depends_on(*mods)