diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2017-08-01 16:59:37 -0500 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2017-08-01 16:59:37 -0500 |
| commit | e473946d58cfdab0b16cf91cdad6bef23fcfafc3 (patch) | |
| tree | 8381b3ddd0fca7ef6e9cb7f79aa53a768ecbf376 /activerecord/CHANGELOG.md | |
| parent | 3d3ec20a485a109bb772cb37382040e25f5d0ded (diff) | |
| parent | f9a43f28c087f8ffd35ff7c33a60c938b60f2be2 (diff) | |
| download | rails-e473946d58cfdab0b16cf91cdad6bef23fcfafc3.tar.gz rails-e473946d58cfdab0b16cf91cdad6bef23fcfafc3.tar.bz2 rails-e473946d58cfdab0b16cf91cdad6bef23fcfafc3.zip | |
Merge branch 'master' into active-storage-import
Diffstat (limited to 'activerecord/CHANGELOG.md')
| -rw-r--r-- | activerecord/CHANGELOG.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index aa581ed1e6..8181d67816 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,4 +1,4 @@ -* When using #or, extract the common conditions and put them before the OR condition. +* When using `Relation#or`, extract the common conditions and put them before the OR condition. *Maxime Handfield Lapointe* |