aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/middleware/flash.rb
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2016-03-21 14:01:06 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2016-03-21 14:01:06 -0300
commitd5977c67bdd6a459e21328cb8c0cf2cf47ccc185 (patch)
treec986d3456b411e75e96a047529778908ff3123b7 /actionpack/lib/action_dispatch/middleware/flash.rb
parentdda31d59a03adb7e5aa372e72bb66a3886632f2f (diff)
parent6c6a22176f01b563a7b731fee9f37c837ba83320 (diff)
downloadrails-d5977c67bdd6a459e21328cb8c0cf2cf47ccc185.tar.gz
rails-d5977c67bdd6a459e21328cb8c0cf2cf47ccc185.tar.bz2
rails-d5977c67bdd6a459e21328cb8c0cf2cf47ccc185.zip
Merge pull request #24229 from maclover7/fix-24222
Fix request.reset_session for API controllers
Diffstat (limited to 'actionpack/lib/action_dispatch/middleware/flash.rb')
-rw-r--r--actionpack/lib/action_dispatch/middleware/flash.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/flash.rb b/actionpack/lib/action_dispatch/middleware/flash.rb
index c51dcd542a..06038af571 100644
--- a/actionpack/lib/action_dispatch/middleware/flash.rb
+++ b/actionpack/lib/action_dispatch/middleware/flash.rb
@@ -70,6 +70,11 @@ module ActionDispatch
session.delete('flash')
end
end
+
+ def reset_session # :nodoc
+ super
+ self.flash = nil
+ end
end
class FlashNow #:nodoc: