aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/middleware/cookies.rb
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2015-09-06 18:06:46 +0200
committerKasper Timm Hansen <kaspth@gmail.com>2015-09-08 20:27:05 +0200
commit57c4a58d0236f2c8e54e0632e75f89846df4bc6f (patch)
tree43b8a8b9ca76cd96ea6801e079d286db63f78c16 /actionpack/lib/action_dispatch/middleware/cookies.rb
parente05136ab41916a91add7d46f26cf119ff0dfaf34 (diff)
downloadrails-57c4a58d0236f2c8e54e0632e75f89846df4bc6f.tar.gz
rails-57c4a58d0236f2c8e54e0632e75f89846df4bc6f.tar.bz2
rails-57c4a58d0236f2c8e54e0632e75f89846df4bc6f.zip
Move the request method in to the AbstractCookieJar
`CookieJar` is only at the start of the chain and has its own request method, so we don't need it in the module.
Diffstat (limited to 'actionpack/lib/action_dispatch/middleware/cookies.rb')
-rw-r--r--actionpack/lib/action_dispatch/middleware/cookies.rb7
1 files changed, 3 insertions, 4 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/cookies.rb b/actionpack/lib/action_dispatch/middleware/cookies.rb
index b292efee5c..0f316be681 100644
--- a/actionpack/lib/action_dispatch/middleware/cookies.rb
+++ b/actionpack/lib/action_dispatch/middleware/cookies.rb
@@ -221,10 +221,6 @@ module ActionDispatch
end
end
- protected
-
- def request; @parent_jar.request; end
-
private
def upgrade_legacy_signed_cookies?
@@ -441,6 +437,9 @@ module ActionDispatch
@parent_jar[name] = options
end
+ protected
+ def request; @parent_jar.request; end
+
private
def parse(name, data); data; end
def commit(options); end