diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-08-23 00:33:58 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-08-23 00:33:58 +0000 |
| commit | 51dca778ed7f0ad852d451a42676ac7d196e0e96 (patch) | |
| tree | 0e4eeec668d16d8f710fc65409f0224231250890 /VERSION | |
| parent | a79ff9346b73079148cc4ecc81da82804bb51f3c (diff) | |
| parent | 8f9a7ca854ffda26c5ce9aed2aec10bf155d0463 (diff) | |
| download | gitlab-ce-51dca778ed7f0ad852d451a42676ac7d196e0e96.tar.gz | |
Merge branch 'revert_revert_issuable_lock' into 'master'
Revert the revert of Optimistic Locking
## What does this MR do?
It reverts the revert of optimistic lock https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5146 (and revert MR https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5245)
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/19871
Actually the code is already reviewed, except:
* Monkey patch `config/initializers/ar_monkey_patch.rb`
* We removed default values from migration `db/migrate/20160707104333_add_lock_to_issuables.rb`
See merge request !5623
Diffstat (limited to 'VERSION')
0 files changed, 0 insertions, 0 deletions