diff options
| author | Yves Senn <yves.senn@gmail.com> | 2013-06-25 04:20:55 -0700 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2013-06-25 04:20:55 -0700 |
| commit | 79abf07be8f623ae803659c38c2692a234cc7831 (patch) | |
| tree | 483de52a1cd68215943a1f790cb6995707386b77 | |
| parent | aaad6b6e13dd83f64e7c582bbd63bbe0eb6e4814 (diff) | |
| parent | 444d3412b90fab2cc0a0d3bab48d8eda3b9fed31 (diff) | |
| download | rails-79abf07be8f623ae803659c38c2692a234cc7831.tar.gz rails-79abf07be8f623ae803659c38c2692a234cc7831.tar.bz2 rails-79abf07be8f623ae803659c38c2692a234cc7831.zip | |
Merge pull request #11084 from arkiver/master
Fixing issue #11083
| -rw-r--r-- | actionpack/CHANGELOG.md | 2 | ||||
| -rw-r--r-- | activemodel/lib/active_model/secure_password.rb | 2 | ||||
| -rw-r--r-- | guides/source/form_helpers.md | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index 59d9c89c8e..e33accf854 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.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 diff --git a/activemodel/lib/active_model/secure_password.rb b/activemodel/lib/active_model/secure_password.rb index e553590671..7156f1bb30 100644 --- a/activemodel/lib/active_model/secure_password.rb +++ b/activemodel/lib/active_model/secure_password.rb @@ -15,7 +15,7 @@ module ActiveModel # 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: diff --git a/guides/source/form_helpers.md b/guides/source/form_helpers.md index b409534cb0..7f37a298b1 100644 --- a/guides/source/form_helpers.md +++ b/guides/source/form_helpers.md @@ -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. |