aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/CHANGELOG.md
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2016-10-21 09:08:38 -0700
committerGitHub <noreply@github.com>2016-10-21 09:08:38 -0700
commit0aed0bbb2956e3607a1a15d260a0833d4d3a7aa0 (patch)
treeb397dd02111aaf30d6e042a66a20ad0d27669500 /activerecord/CHANGELOG.md
parent4393406a8ac0d3c616210a96bca81dd6a12bf881 (diff)
parenta60a20bb7faae4d0758676b865f625275c500e4e (diff)
downloadrails-0aed0bbb2956e3607a1a15d260a0833d4d3a7aa0.tar.gz
rails-0aed0bbb2956e3607a1a15d260a0833d4d3a7aa0.tar.bz2
rails-0aed0bbb2956e3607a1a15d260a0833d4d3a7aa0.zip
Merge pull request #26050 from bogdanvlviv/optimistic_locking
Fixed: Optimistic locking does not work correctly
Diffstat (limited to 'activerecord/CHANGELOG.md')
-rw-r--r--activerecord/CHANGELOG.md11
1 files changed, 11 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 15b49e0a0b..f847c71420 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,3 +1,14 @@
+* Optimistic locking: Added ability update locking_column value.
+ Ignore optimistic locking if update with new locking_column value.
+
+ *bogdanvlviv*
+
+* Fixed: Optimistic locking does not work well with null in the database.
+
+ Fixes #26024
+
+ *bogdanvlviv*
+
* Fixed support for case insensitive comparisons of `text` columns in
PostgreSQL.