Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cookie store session hash #5601

Merged
merged 2 commits into from Mar 26, 2012
Merged

Cookie store session hash #5601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ad9a8e
Return the same session data object when setting session id
carlosantoniodasilva Mar 24, 2012
2ceb3fc
Remove warning added by my own commit :fire:
carlosantoniodasilva Mar 26, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion actionpack/lib/action_dispatch/middleware/session/cookie_store.rb
View file
Open in desktop
Expand Up @@ -59,7 +59,8 @@ def unpacked_cookie_data(env)
end

def set_session(env, sid, session_data, options)
session_data.merge("session_id" => sid)
session_data["session_id"] = sid
session_data
end

def set_cookie(env, session_id, cookie)
Expand Down
2 changes: 1 addition & 1 deletion actionpack/test/template/form_helper_test.rb
View file
Open in desktop
Expand Up @@ -2238,7 +2238,7 @@ def initialize(object_name, object, template, options, block)
end
end

assert_deprecated /Giving a block to FormBuilder is deprecated and has no effect anymore/ do
assert_deprecated(/Giving a block to FormBuilder is deprecated and has no effect anymore/) do
builder_class.new(:foo, nil, nil, {}, proc {})
end
end
Expand Down