diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-07-12 17:52:51 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-07-12 17:52:51 +0000 |
| commit | d5c715c9cc23a403d908e4686db152d8316ac684 (patch) | |
| tree | 79925b83c8d1497592da23613b5492867d701f39 /CHANGELOG | |
| parent | 1ed89d376fc67ae50c5de2f538355fa6d1ab6d5b (diff) | |
| parent | c39356998b1850f3dc26fe0b987cb419c1d1afb4 (diff) | |
| download | gitlab-ce-d5c715c9cc23a403d908e4686db152d8316ac684.tar.gz | |
Merge branch 'lock_for_issuable' into 'master'
Optimistic locking for Issue and Merge Requests
## What does this MR do?
It implements Optimistic Locking http://api.rubyonrails.org/classes/ActiveRecord/Locking/Optimistic.html for Issues and MRs but in a bit custom way. We use it for cases when either title or description field is involved in the change.
## Why was this MR needed?
We have to prevent data losing.
## What are the relevant issue numbers?
https://gitlab.com/gitlab-org/gitlab-ce/issues/12940
## Screenshots (if relevant)
See merge request !5146
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 2ad8460731e..a50edf1a797 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -82,6 +82,7 @@ v 8.10.0 (unreleased) - Remove duplicate `description` field in `MergeRequest` entities (Ben Boeckel) - Style of import project buttons were fixed in the new project page. !5183 (rdemirbay) - Fix GitHub client requests when rate limit is disabled + - Optimistic locking for Issues and Merge Requests (Title and description overriding prevention) v 8.9.6 (unreleased) - Fix importing of events under notes for GitLab projects |