diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2014-03-07 20:58:11 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2014-03-07 20:58:11 +0530 |
| commit | 70ff31d69f017d1bc674b913865d5a008de0c8a6 (patch) | |
| tree | e4596f11dca55aeef789922713fa07eee109e742 /actionpack | |
| parent | 507ee79a6ce2756266fbe82d63235fe7aef77594 (diff) | |
| parent | 3f1699a780de5cd0c3433bc3427cc43f08f77040 (diff) | |
| download | rails-70ff31d69f017d1bc674b913865d5a008de0c8a6.tar.gz rails-70ff31d69f017d1bc674b913865d5a008de0c8a6.tar.bz2 rails-70ff31d69f017d1bc674b913865d5a008de0c8a6.zip | |
Merge branch 'master' of github.com:rails/docrails
Conflicts:
guides/source/4_1_release_notes.md
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/cookies.rb | 2 |
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 18e64704f6..8b05cd6e11 100644 --- a/actionpack/lib/action_dispatch/middleware/cookies.rb +++ b/actionpack/lib/action_dispatch/middleware/cookies.rb @@ -74,7 +74,7 @@ module ActionDispatch # # domain: nil # Does not sets cookie domain. (default) # domain: :all # Allow the cookie for the top most level - # domain and subdomains. + # # domain and subdomains. # # * <tt>:expires</tt> - The time at which this cookie expires, as a \Time object. # * <tt>:secure</tt> - Whether this cookie is only transmitted to HTTPS servers. |