Merge pull request #22149 from samphilipd/master

Update changelog for #22122

Merge pull request #22149 from samphilipd/master
Update changelog for #22122
46b08da0 · Andrew White · 9e78eb18 · 2e43eefa · 46b08da0
隐藏空白更改
内联并排

Showing with 5 addition and 0 deletion

activerecord/CHANGELOG.md activerecord/CHANGELOG.md +5 -0

未找到文件。
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
+*   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: