diff options
| author | Andrew White <andrew.white@unboxedconsulting.com> | 2015-11-02 11:09:34 +0000 |
|---|---|---|
| committer | Andrew White <andrew.white@unboxedconsulting.com> | 2015-11-02 11:09:34 +0000 |
| commit | 10a80e39feb8f5da0ff50f1b04c3f84e7bbbbb54 (patch) | |
| tree | e7a248865f97155bbe29eca19bb838e38e8a2d80 /activerecord | |
| parent | 5b7afb81aee40d1bdca9b7a767585f22c7592870 (diff) | |
| parent | 2a90d60c941deb4ba31fa7bcfd5ebee1b536c963 (diff) | |
| download | rails-10a80e39feb8f5da0ff50f1b04c3f84e7bbbbb54.tar.gz rails-10a80e39feb8f5da0ff50f1b04c3f84e7bbbbb54.tar.bz2 rails-10a80e39feb8f5da0ff50f1b04c3f84e7bbbbb54.zip | |
Merge pull request #22130 from k0kubun/left-joins-changelog
Add CHANGELOG entry for #22125 [ci skip]
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/CHANGELOG.md | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index 97df382bb1..88546695e8 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,3 +1,8 @@ +* Alias `ActiveRecord::Relation#left_joins` to + `ActiveRecord::Relation#left_outer_joins`. + + *Takashi Kokubun* + * Use advisory locking to raise a ConcurrentMigrationError instead of attempting to migrate when another migration is currently running. |