-
- Downloads
There was a problem fetching the pipeline summary.
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
Showing
- CHANGELOG 2 additions, 0 deletionsCHANGELOG
- app/controllers/projects/issues_controller.rb 5 additions, 1 deletionapp/controllers/projects/issues_controller.rb
- app/controllers/projects/merge_requests_controller.rb 4 additions, 1 deletionapp/controllers/projects/merge_requests_controller.rb
- app/models/concerns/issuable.rb 6 additions, 0 deletionsapp/models/concerns/issuable.rb
- app/views/shared/issuable/_form.html.haml 9 additions, 0 deletionsapp/views/shared/issuable/_form.html.haml
- config/initializers/ar_monkey_patch.rb 57 additions, 0 deletionsconfig/initializers/ar_monkey_patch.rb
- db/migrate/20160707104333_add_lock_to_issuables.rb 18 additions, 0 deletionsdb/migrate/20160707104333_add_lock_to_issuables.rb
- db/schema.rb 17 additions, 15 deletionsdb/schema.rb
- features/project/merge_requests.feature 1 addition, 1 deletionfeatures/project/merge_requests.feature
- spec/features/issues_spec.rb 11 additions, 0 deletionsspec/features/issues_spec.rb
- spec/features/merge_requests/edit_mr_spec.rb 11 additions, 0 deletionsspec/features/merge_requests/edit_mr_spec.rb
Loading
Please register or sign in to comment