diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2013-10-15 14:54:31 -0700 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2013-10-15 14:54:31 -0700 |
commit | 5c7633cd30a80e9cf747ff39798aea8c03f70420 (patch) | |
tree | da9378390da9aefbb3e0e7647296ded57f50d683 /railties/CHANGELOG.md | |
parent | ee46f1d5d2a8825de2d4973fb0301f2d85986e73 (diff) | |
parent | f6e7e11ad28555860bb8a1bb362fa091f48cc81a (diff) | |
download | rails-5c7633cd30a80e9cf747ff39798aea8c03f70420.tar.gz rails-5c7633cd30a80e9cf747ff39798aea8c03f70420.tar.bz2 rails-5c7633cd30a80e9cf747ff39798aea8c03f70420.zip |
Merge branch 'master' into joindep
* master:
use the cached arel table
Fix typo in the changelog entry
Don't remove the select values to add they back again
Pluck on NullRelation accepts a list of columns
Conflicts:
activerecord/lib/active_record/relation/finder_methods.rb
Diffstat (limited to 'railties/CHANGELOG.md')
-rw-r--r-- | railties/CHANGELOG.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md index 8a0e0ff3f6..1d01c8d0e5 100644 --- a/railties/CHANGELOG.md +++ b/railties/CHANGELOG.md @@ -1,4 +1,4 @@ -* Added `--model-name` scaffld\_controller\_generator option. +* Added `--model-name` option to `ScaffoldControllerGenerator`. *yalab* |