diff options
| author | Andrew White <pixeltrix@users.noreply.github.com> | 2015-11-01 21:40:06 +0000 |
|---|---|---|
| committer | Andrew White <pixeltrix@users.noreply.github.com> | 2015-11-01 21:40:06 +0000 |
| commit | 46b08da0eaccf1af4d69d01efa7f01e58ee3ca67 (patch) | |
| tree | 4397a14c9ae3de7a6d84e72b49c85c19426dec52 /activerecord | |
| parent | 9e78eb18e54c465056b61c88363e7faf219cb90d (diff) | |
| parent | 2e43eefa94b5f98ab4b082dde1dbf34c5d7eedff (diff) | |
| download | rails-46b08da0eaccf1af4d69d01efa7f01e58ee3ca67.tar.gz rails-46b08da0eaccf1af4d69d01efa7f01e58ee3ca67.tar.bz2 rails-46b08da0eaccf1af4d69d01efa7f01e58ee3ca67.zip | |
Merge pull request #22149 from samphilipd/master
Update changelog for #22122
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 90cf71521a..97df382bb1 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,3 +1,8 @@ +* Use advisory locking to raise a ConcurrentMigrationError instead of + attempting to migrate when another migration is currently running. + + *Sam Davies* + * Added `ActiveRecord::Relation#left_outer_joins`. Example: |