aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2009-01-06 16:57:41 -0800
committerJeremy Kemper <jeremy@bitsweat.net>2009-01-06 16:57:41 -0800
commit8736dd324117af90e0bf120cfd2074b06ccb45eb (patch)
tree5bee837c9108ad92502ebb0dfd30a283e5755981 /actionpack
parent851c3de5c973bf6c0abf2c3b24f1a71dafdcd97a (diff)
downloadrails-8736dd324117af90e0bf120cfd2074b06ccb45eb.tar.gz
rails-8736dd324117af90e0bf120cfd2074b06ccb45eb.tar.bz2
rails-8736dd324117af90e0bf120cfd2074b06ccb45eb.zip
Fix failing flash test
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_controller/base.rb2
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