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 /actionpack | |
| 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
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/CHANGELOG.md | 2 |
1 files changed, 1 insertions, 1 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 |