aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/CHANGELOG.md
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2016-10-22 00:59:48 -0300
committerGitHub <noreply@github.com>2016-10-22 00:59:48 -0300
commit8013ff682ff1c1049a45005e1ec4c865deef3ca4 (patch)
treed81f7eb252bf96cf8b7e0ef166431dd8bef9d6ab /activerecord/CHANGELOG.md
parent7bbd3e68ed137af2adf33e8ad06aaa8c1b7d7069 (diff)
parent56bfaf7f03882f738bb65fd232b4c67541afc4f5 (diff)
downloadrails-8013ff682ff1c1049a45005e1ec4c865deef3ca4.tar.gz
rails-8013ff682ff1c1049a45005e1ec4c865deef3ca4.tar.bz2
rails-8013ff682ff1c1049a45005e1ec4c865deef3ca4.zip
Merge pull request #26416 from prathamesh-sonpatki/fix-select-example
Fix regression caused due to removal of select method from CollectionAssociation
Diffstat (limited to 'activerecord/CHANGELOG.md')
-rw-r--r--activerecord/CHANGELOG.md5
1 files changed, 5 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index f847c71420..cc7ba49c87 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,3 +1,8 @@
+* Deprecate passing arguments and block at the same time to
+ `ActiveRecord::QueryMethods#select`.
+
+ *Prathamesh Sonpatki*
+
* Optimistic locking: Added ability update locking_column value.
Ignore optimistic locking if update with new locking_column value.