aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2015-07-17 17:35:30 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2015-07-17 17:35:30 -0300
commit8c147bcdf79549fae46eedc3c4a5d9713f3faa27 (patch)
tree8e4e624b8bae0733338f56410adae24bc0ce16e5 /actionpack
parent2c79122c0bbd61dcef12b95c80e025490d5a9783 (diff)
parentea747f7d2ee3854627c4cdc41fa059f249e87394 (diff)
downloadrails-8c147bcdf79549fae46eedc3c4a5d9713f3faa27.tar.gz
rails-8c147bcdf79549fae46eedc3c4a5d9713f3faa27.tar.bz2
rails-8c147bcdf79549fae46eedc3c4a5d9713f3faa27.zip
Merge pull request #20918 from jonatack/fix-lookup-grammar
[skip ci] Lookup can be a noun but it is not a verb
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/CHANGELOG.md3
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index c70e6a771f..4b081591c0 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -183,7 +183,8 @@
*arthurnn*
* `ActionController#translate` supports symbols as shortcuts.
- When shortcut is given it also lookups without action name.
+ When a shortcut is given it also performs the lookup without the action
+ name.
*Max Melentiev*