aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/CHANGELOG.md
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2017-11-28 15:36:51 -0500
committerRafael Mendonça França <rafaelmfranca@gmail.com>2017-11-28 15:36:51 -0500
commit8633567169bb7b7bbab1ec8ddf6fe140d6db2e99 (patch)
tree6e97c2a0772f45c286ba67d629cedb93c588d538 /activerecord/CHANGELOG.md
parent591c4a44580b0d6b5e43395061df9f5e8cfaee49 (diff)
parent6552ce0361f30a46a58a8bcb659866f06c8b7430 (diff)
downloadrails-8633567169bb7b7bbab1ec8ddf6fe140d6db2e99.tar.gz
rails-8633567169bb7b7bbab1ec8ddf6fe140d6db2e99.tar.bz2
rails-8633567169bb7b7bbab1ec8ddf6fe140d6db2e99.zip
Merge pull request #31179 from kinnrot/scoping-reserved-names
Scoping reserved names
Diffstat (limited to 'activerecord/CHANGELOG.md')
-rw-r--r--activerecord/CHANGELOG.md7
1 files changed, 7 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index cad026db40..60ceffac5e 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,3 +1,10 @@
+* Don't allow scopes to be defined which conflict with instance methods on `Relation`.
+
+ Fixes #31120.
+
+ *kinnrot*
+
+
## Rails 5.2.0.beta2 (November 28, 2017) ##
* No changes.