aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2016-07-07 17:33:28 -0300
committerGitHub <noreply@github.com>2016-07-07 17:33:28 -0300
commit24f04b665748f3139c504f99b1e936ee44ebc258 (patch)
tree96b15ea5a64eb8df88dcc9092064a76c3a10b11b /actionpack/lib
parent267c53a2a30e53eeb6fb58210398ab9d4ef9985b (diff)
parent193ad87b343a5b4616b57ac8af8817f2a3cf640a (diff)
downloadrails-24f04b665748f3139c504f99b1e936ee44ebc258.tar.gz
rails-24f04b665748f3139c504f99b1e936ee44ebc258.tar.bz2
rails-24f04b665748f3139c504f99b1e936ee44ebc258.zip
Merge pull request #25730 from prathamesh-sonpatki/rm-cookie-only
No need to set `cookie_only` option from Rails
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_dispatch/middleware/session/cookie_store.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb b/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb
index dec9c60ef2..380a24a367 100644
--- a/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb
+++ b/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb
@@ -64,7 +64,7 @@ module ActionDispatch
# <tt>:httponly</tt>.
class CookieStore < AbstractStore
def initialize(app, options={})
- super(app, options.merge!(:cookie_only => true))
+ super(app, options.merge!(cookie_only: true))
end
def delete_session(req, session_id, options)