aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/abstract/layouts.rb
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2009-05-28 11:35:36 -0500
committerJoshua Peek <josh@joshpeek.com>2009-05-28 11:35:36 -0500
commit4e50a35fa243f6cf7ad567774a9f7c1cb87a1653 (patch)
tree6bfb95c899c61b10406a03f8e9a6211b93fecd6b /actionpack/lib/action_controller/abstract/layouts.rb
parentde203245afd2bbf7f93f3241fcf3a71a88101d47 (diff)
downloadrails-4e50a35fa243f6cf7ad567774a9f7c1cb87a1653.tar.gz
rails-4e50a35fa243f6cf7ad567774a9f7c1cb87a1653.tar.bz2
rails-4e50a35fa243f6cf7ad567774a9f7c1cb87a1653.zip
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.
Diffstat (limited to 'actionpack/lib/action_controller/abstract/layouts.rb')
-rw-r--r--actionpack/lib/action_controller/abstract/layouts.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/abstract/layouts.rb b/actionpack/lib/action_controller/abstract/layouts.rb
index dd38485271..b3f21f7b22 100644
--- a/actionpack/lib/action_controller/abstract/layouts.rb
+++ b/actionpack/lib/action_controller/abstract/layouts.rb
@@ -1,6 +1,6 @@
module AbstractController
module Layouts
- extend ActiveSupport::DependencyModule
+ extend ActiveSupport::Concern
depends_on Renderer