Merge branch 'master' into wip_abstract_controller

Conflicts:
	actionpack/lib/action_controller/abstract/callbacks.rb
	actionpack/lib/action_controller/abstract/renderer.rb
	actionpack/lib/action_controller/base/base.rb
	actionpack/lib/action_controller/dispatch/dispatcher.rb
	actionpack/lib/action_controller/routing/route_set.rb
	actionpack/lib/action_controller/testing/process.rb
	actionpack/test/abstract_controller/layouts_test.rb
	actionpack/test/controller/filters_test.rb
	actionpack/test/controller/helper_test.rb
	actionpack/test/controller/render_test.rb
	actionpack/test/new_base/test_helper.rb

1 files changed, 25 insertions, 0 deletions

diff --git a/activesupport/lib/active_support/dependency_module.rb b/activesupport/lib/active_support/dependency_module.rb
new file mode 100644
index 0000000000..8c202acc8f
--- /dev/null
+++ b/activesupport/lib/active_support/dependency_module.rb
@@ -0,0 +1,25 @@
+module ActiveSupport
+  module DependencyModule
+    def append_features(base)
+      return 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(mod)
+      return if self < mod
+      @_dependencies ||= []
+      @_dependencies << mod
+    end
+  end
+end