aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2013-07-04 00:58:38 -0700
committerXavier Noria <fxn@hashref.com>2013-07-04 00:58:38 -0700
commitc91d266cdfcdc15d101d3d4360ef6c5a730d36e9 (patch)
tree7e4149783d631f5ce5c28e417dc81a12128d0c38 /actionpack
parent685631285f21e2f63b1ecbdb1495f25c97b6bf41 (diff)
parent1ba0a1f87ab0f77a2216a3805b0cf3a4d00ed2c3 (diff)
downloadrails-c91d266cdfcdc15d101d3d4360ef6c5a730d36e9.tar.gz
rails-c91d266cdfcdc15d101d3d4360ef6c5a730d36e9.tar.bz2
rails-c91d266cdfcdc15d101d3d4360ef6c5a730d36e9.zip
Merge pull request #11286 from edogawaconan/fix/doc-201307041646
Missing closing + in documentation [ci skip]
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_dispatch/middleware/cookies.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/cookies.rb b/actionpack/lib/action_dispatch/middleware/cookies.rb
index d055acb296..3ccd0c9ee8 100644
--- a/actionpack/lib/action_dispatch/middleware/cookies.rb
+++ b/actionpack/lib/action_dispatch/middleware/cookies.rb
@@ -160,7 +160,7 @@ module ActionDispatch
end
end
- # Returns the +signed+ or +encrypted jar, preferring +encrypted+ if +secret_key_base+ is set.
+ # Returns the +signed+ or +encrypted+ jar, preferring +encrypted+ if +secret_key_base+ is set.
# Used by ActionDispatch::Session::CookieStore to avoid the need to introduce new cookie stores.
def signed_or_encrypted
@signed_or_encrypted ||=