diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2016-05-04 22:36:54 +0200 |
|---|---|---|
| committer | Kasper Timm Hansen <kaspth@gmail.com> | 2016-05-04 22:36:54 +0200 |
| commit | 3bed679670dd8348ffc348509a653677c6ecb7f3 (patch) | |
| tree | 9e5cd47acac9439ebb9b2825d3196e407b80a368 /actionpack/lib | |
| parent | 8352c8c6ef58eef822947faf8defc378e5de057c (diff) | |
| parent | 09159d8530069ded68d1d5455dbe5009fb44c1c7 (diff) | |
| download | rails-3bed679670dd8348ffc348509a653677c6ecb7f3.tar.gz rails-3bed679670dd8348ffc348509a653677c6ecb7f3.tar.bz2 rails-3bed679670dd8348ffc348509a653677c6ecb7f3.zip | |
Merge pull request #24820 from maclover7/fix-15843
Ensure compatibility between ActionDispatch::Request::Session and Rack
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_dispatch/request/session.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/request/session.rb b/actionpack/lib/action_dispatch/request/session.rb index 42890225fa..47568f6ad0 100644 --- a/actionpack/lib/action_dispatch/request/session.rb +++ b/actionpack/lib/action_dispatch/request/session.rb @@ -9,7 +9,7 @@ module ActionDispatch # Singleton object used to determine if an optional param wasn't specified Unspecified = Object.new - + # Creates a session hash, merging the properties of the previous session if any def self.create(store, req, default_options) session_was = find req @@ -198,6 +198,10 @@ module ActionDispatch @delegate.merge!(other) end + def each(&block) + to_hash.each(&block) + end + private def load_for_read! |