aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/CHANGELOG.md
diff options
context:
space:
mode:
authorMatthew Draper <matthew@trebex.net>2018-08-23 01:04:14 +0930
committerGitHub <noreply@github.com>2018-08-23 01:04:14 +0930
commit24f6bf0d96b58f2b2ef6a886c93d35cf8ce4f293 (patch)
tree6bbe27eb6d6e12ec25c2574cfd13b8397bafb638 /activerecord/CHANGELOG.md
parent047a893da7a43b8e115b854c73735b9e6475838e (diff)
parent20bb397e00dad9dfdb38d0c8dd73062b448c31e3 (diff)
downloadrails-24f6bf0d96b58f2b2ef6a886c93d35cf8ce4f293.tar.gz
rails-24f6bf0d96b58f2b2ef6a886c93d35cf8ce4f293.tar.bz2
rails-24f6bf0d96b58f2b2ef6a886c93d35cf8ce4f293.zip
Merge pull request #33691 from tgxworld/add_config_to_disable_advisory_locks
Add database configuration to disable advisory locks.
Diffstat (limited to 'activerecord/CHANGELOG.md')
-rw-r--r--activerecord/CHANGELOG.md10
1 files changed, 10 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index f6a6aa05a9..71dcecd346 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,3 +1,13 @@
+* Add database configuration to disable advisory locks.
+
+ ```
+ production:
+ adapter: postgresql
+ advisory_locks: false
+ ```
+
+ *Guo Xiang*
+
* SQLite3 adapter `alter_table` method restores foreign keys.
*Yasuo Honda*