Permalink
Browse files

Merge pull request #11084 from arkiver/master

Fixing issue  #11083
  • Loading branch information...
2 parents aaad6b6 + 444d341 commit 79abf07be8f623ae803659c38c2692a234cc7831 @senny senny committed Jun 25, 2013
Showing with 3 additions and 3 deletions.
  1. +1 −1 actionpack/CHANGELOG.md
  2. +1 −1 activemodel/lib/active_model/secure_password.rb
  3. +1 −1 guides/source/form_helpers.md
@@ -1,7 +1,7 @@
* Merge `:action` from routing scope and assign endpoint if both `:controller`
and `:action` are present. The endpoint assignment only occurs if there is
no `:to` present in the options hash so should only affect routes using the
- shorthand syntax (i.e. endpoint is inferred from the the path).
+ shorthand syntax (i.e. endpoint is inferred from the path).
Fixes #9856
@@ -15,7 +15,7 @@ module ClassMethods
# argument. You can add more validations by hand if need be.
#
# If you don't need the confirmation validation, just don't set any
- # value to the password_confirmation attribute and the the validation
+ # value to the password_confirmation attribute and the validation
# will not be triggered.
#
# You need to add bcrypt-ruby (~> 3.0.0) to Gemfile to use #has_secure_password:
@@ -973,4 +973,4 @@ As a convenience you can instead pass the symbol `:all_blank` which will create
### Adding Fields on the Fly
-Rather than rendering multiple sets of fields ahead of time you may wish to add them only when a user clicks on an 'Add new child' button. Rails does not provide any builtin support for this. When generating new sets of fields you must ensure the the key of the associated array is unique - the current javascript date (milliseconds after the epoch) is a common choice.
+Rather than rendering multiple sets of fields ahead of time you may wish to add them only when a user clicks on an 'Add new child' button. Rails does not provide any builtin support for this. When generating new sets of fields you must ensure the key of the associated array is unique - the current javascript date (milliseconds after the epoch) is a common choice.

0 comments on commit 79abf07

Please sign in to comment.