aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorSam Davies <seivadmas@gmail.com>2015-11-01 17:52:03 -0300
committerSam Davies <seivadmas@gmail.com>2015-11-01 17:52:03 -0300
commit2e43eefa94b5f98ab4b082dde1dbf34c5d7eedff (patch)
tree4397a14c9ae3de7a6d84e72b49c85c19426dec52 /activerecord
parent9e78eb18e54c465056b61c88363e7faf219cb90d (diff)
downloadrails-2e43eefa94b5f98ab4b082dde1dbf34c5d7eedff.tar.gz
rails-2e43eefa94b5f98ab4b082dde1dbf34c5d7eedff.tar.bz2
rails-2e43eefa94b5f98ab4b082dde1dbf34c5d7eedff.zip
Update changelog for #22122
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/CHANGELOG.md5
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: