aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorschneems <richard.schneeman@gmail.com>2015-04-07 14:58:44 -0500
committerschneems <richard.schneeman@gmail.com>2015-04-07 14:58:44 -0500
commit44cfb2ab8a57627bca826bf68ffb1cf26ee55fdb (patch)
tree13ebbfbc242241ee29efee61c4a7611e6a4e6cf1 /actionpack
parentd69d662e650d5140be0c5abb72289af94747e8b7 (diff)
parent164be37da5bdcf99a941ab221b90d8c8adfd1a82 (diff)
downloadrails-44cfb2ab8a57627bca826bf68ffb1cf26ee55fdb.tar.gz
rails-44cfb2ab8a57627bca826bf68ffb1cf26ee55fdb.tar.bz2
rails-44cfb2ab8a57627bca826bf68ffb1cf26ee55fdb.zip
Merge pull request #19677 from treble37/update-docs-ActionDispatch__Request__Session.create-for-pr
added docs for ActionDispatch::Request::Session#create
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_dispatch/request/session.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/request/session.rb b/actionpack/lib/action_dispatch/request/session.rb
index 973627f106..9a1a05e971 100644
--- a/actionpack/lib/action_dispatch/request/session.rb
+++ b/actionpack/lib/action_dispatch/request/session.rb
@@ -9,7 +9,8 @@ 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, env, default_options)
session_was = find env
session = Request::Session.new(store, env)