aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorAkshay Khole <akshay@reversehack.in>2013-06-25 15:55:03 +0530
committerAkshay Khole <akshay@reversehack.in>2013-06-25 16:47:29 +0530
commit444d3412b90fab2cc0a0d3bab48d8eda3b9fed31 (patch)
tree483de52a1cd68215943a1f790cb6995707386b77 /actionpack
parentaaad6b6e13dd83f64e7c582bbd63bbe0eb6e4814 (diff)
downloadrails-444d3412b90fab2cc0a0d3bab48d8eda3b9fed31.tar.gz
rails-444d3412b90fab2cc0a0d3bab48d8eda3b9fed31.tar.bz2
rails-444d3412b90fab2cc0a0d3bab48d8eda3b9fed31.zip
Fixing Issue #11083
Removing other occurrences of `the` appearing twice
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/CHANGELOG.md2
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