diff options
| author | Yehuda Katz <wycats@gmail.com> | 2009-01-06 17:43:53 -0800 |
|---|---|---|
| committer | Yehuda Katz <wycats@gmail.com> | 2009-01-06 17:43:58 -0800 |
| commit | dabf20d54b42a2bbe004ceba29c26da147314a46 (patch) | |
| tree | dfcdd64813a311c672306e0c6f1e0de2912fa597 /actionpack/lib/action_controller | |
| parent | 3027f9f918a1fda5c66aa3e7bb4af1f8064b10ba (diff) | |
| parent | 8736dd324117af90e0bf120cfd2074b06ccb45eb (diff) | |
| download | rails-dabf20d54b42a2bbe004ceba29c26da147314a46.tar.gz rails-dabf20d54b42a2bbe004ceba29c26da147314a46.tar.bz2 rails-dabf20d54b42a2bbe004ceba29c26da147314a46.zip | |
Sync 'rails/rails/master'
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/base.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 1093a9bc04..e22114195c 100644 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -1350,7 +1350,7 @@ module ActionController #:nodoc: end Base.class_eval do - [ Flash, Filters, Layout, Benchmarking, Rescue, MimeResponds, Helpers, + [ Filters, Layout, Benchmarking, Rescue, Flash, MimeResponds, Helpers, Cookies, Caching, Verification, Streaming, SessionManagement, HttpAuthentication::Basic::ControllerMethods, RecordIdentifier, RequestForgeryProtection, Translation |