diff options
| author | Willian Gustavo Veiga <beberveiga@gmail.com> | 2018-10-17 20:24:44 -0300 |
|---|---|---|
| committer | Willian Gustavo Veiga <beberveiga@gmail.com> | 2018-10-17 20:24:44 -0300 |
| commit | c8ff9bd63a2371b6f0f0b4f48abf29cf89a1d397 (patch) | |
| tree | e72e4476555fbee75961e473ce336c08fdd10fa6 /activerecord/CHANGELOG.md | |
| parent | 99bd626885b72acd44861727918ee107a649e2b4 (diff) | |
| parent | ead868315f9b0fedb351c9b451aa1f66a2dc8038 (diff) | |
| download | rails-c8ff9bd63a2371b6f0f0b4f48abf29cf89a1d397.tar.gz rails-c8ff9bd63a2371b6f0f0b4f48abf29cf89a1d397.tar.bz2 rails-c8ff9bd63a2371b6f0f0b4f48abf29cf89a1d397.zip | |
Merge branch 'master' into feature/reselect-method
Diffstat (limited to 'activerecord/CHANGELOG.md')
| -rw-r--r-- | activerecord/CHANGELOG.md | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index 32fc9df5c7..fd9f5c6385 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,4 +1,12 @@ -* Add `reselect` method. This is short-hand for `unscope(:select).select(fields)`. +* Fix collection cache key with limit and custom select to avoid ambiguous timestamp column error. + + Fixes #33056. + + *Federico Martinez* + +* Add `reselect` method. This is a short-hand for `unscope(:select).select(fields)`. + + Fixes #27340. *Willian Gustavo Veiga* |