aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorConrad Beach <conradbeach@protonmail.com>2019-02-15 08:18:47 -0700
committerConrad Beach <conradbeach@protonmail.com>2019-02-15 08:18:47 -0700
commit0aebca9f25724d75178d31c88c0ee2ac1474ec1a (patch)
tree18025c40e91d82dc4e36eab3121394b5d861edda /activesupport
parentb414ca3f17c76fb1cc43d79fbffd2f3ed95acdde (diff)
downloadrails-0aebca9f25724d75178d31c88c0ee2ac1474ec1a.tar.gz
rails-0aebca9f25724d75178d31c88c0ee2ac1474ec1a.tar.bz2
rails-0aebca9f25724d75178d31c88c0ee2ac1474ec1a.zip
Fix small typo in docs
[ci skip]
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/active_support/message_encryptor.rb2
-rw-r--r--activesupport/lib/active_support/message_verifier.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/message_encryptor.rb b/activesupport/lib/active_support/message_encryptor.rb
index 6f7302e732..7d6f8937f0 100644
--- a/activesupport/lib/active_support/message_encryptor.rb
+++ b/activesupport/lib/active_support/message_encryptor.rb
@@ -53,7 +53,7 @@ module ActiveSupport
# crypt.encrypt_and_sign(parcel, expires_in: 1.month)
# crypt.encrypt_and_sign(doowad, expires_at: Time.now.end_of_year)
#
- # Then the messages can be verified and returned upto the expire time.
+ # Then the messages can be verified and returned up to the expire time.
# Thereafter, verifying returns +nil+.
#
# === Rotating keys
diff --git a/activesupport/lib/active_support/message_verifier.rb b/activesupport/lib/active_support/message_verifier.rb
index 64c557bec6..c4a4afe95f 100644
--- a/activesupport/lib/active_support/message_verifier.rb
+++ b/activesupport/lib/active_support/message_verifier.rb
@@ -71,7 +71,7 @@ module ActiveSupport
# @verifier.generate(parcel, expires_in: 1.month)
# @verifier.generate(doowad, expires_at: Time.now.end_of_year)
#
- # Then the messages can be verified and returned upto the expire time.
+ # Then the messages can be verified and returned up to the expire time.
# Thereafter, the +verified+ method returns +nil+ while +verify+ raises
# <tt>ActiveSupport::MessageVerifier::InvalidSignature</tt>.
#