Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Cookie store session hash #5601

Merged
merged 2 commits into from

2 participants

@carlosantoniodasilva

The same patch idea was applied to both 3-2 and 3-1 branches, #5597 and #5599 respectively, so this just brings it to master.

It also fixes a warning added by my own commit in form tests 7a0cf2f.

@tenderlove tenderlove merged commit b36f240 into rails:master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
View
3  actionpack/lib/action_dispatch/middleware/session/cookie_store.rb
@@ -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)
View
2  actionpack/test/template/form_helper_test.rb
@@ -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
Something went wrong with that request. Please try again.