aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2013-12-01 20:43:32 -0800
committerGuillermo Iguaran <guilleiguaran@gmail.com>2013-12-01 20:43:32 -0800
commit8ab24bec2e47940f04a220c7baf5236ac1b41fdd (patch)
treeb0f8aa56801261840cded6cb488bf8c1a5efbde7 /actionpack/lib
parent98af6596a9316f134c92ace8debdfc3b6a2c50de (diff)
parent223ff7949e2ee453329bb1efee64e92b77480cdf (diff)
downloadrails-8ab24bec2e47940f04a220c7baf5236ac1b41fdd.tar.gz
rails-8ab24bec2e47940f04a220c7baf5236ac1b41fdd.tar.bz2
rails-8ab24bec2e47940f04a220c7baf5236ac1b41fdd.zip
Merge pull request #13130 from gja/master
Removing some gender sensitive object pronouns
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_dispatch/middleware/session/cookie_store.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb b/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb
index b9eb8036e9..11b42ee5be 100644
--- a/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb
+++ b/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb
@@ -15,8 +15,8 @@ module ActionDispatch
# best possible option given your application's configuration.
#
# If you only have secret_token set, your cookies will be signed, but
- # not encrypted. This means a user cannot alter his +user_id+ without
- # knowing your app's secret key, but can easily read his +user_id+. This
+ # not encrypted. This means a user cannot alter their +user_id+ without
+ # knowing your app's secret key, but can easily read their +user_id+. This
# was the default for Rails 3 apps.
#
# If you have secret_key_base set, your cookies will be encrypted. This