diff options
| author | Joshua Peek <josh@joshpeek.com> | 2009-05-28 11:35:36 -0500 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2009-05-28 11:35:36 -0500 |
| commit | 4e50a35fa243f6cf7ad567774a9f7c1cb87a1653 (patch) | |
| tree | 6bfb95c899c61b10406a03f8e9a6211b93fecd6b /actionpack/lib/action_controller/base/chained | |
| parent | de203245afd2bbf7f93f3241fcf3a71a88101d47 (diff) | |
| download | rails-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/base/chained')
| -rw-r--r-- | actionpack/lib/action_controller/base/chained/flash.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/base/chained/flash.rb b/actionpack/lib/action_controller/base/chained/flash.rb index 2d084ba1ab..04d27bf090 100644 --- a/actionpack/lib/action_controller/base/chained/flash.rb +++ b/actionpack/lib/action_controller/base/chained/flash.rb @@ -26,7 +26,7 @@ module ActionController #:nodoc: # # See docs on the FlashHash class for more details about the flash. module Flash - extend ActiveSupport::DependencyModule + extend ActiveSupport::Concern # TODO : Remove the defined? check when new base is the main base depends_on Session if defined?(ActionController::Http) |