diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-07-15 18:29:50 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-07-15 18:29:50 +0000 |
| commit | d4677353b84681bd73f321a0b04bb7eba32dbc9c (patch) | |
| tree | 41e1e63a6761895ef576e3726d1ec4319978f162 /features/project | |
| parent | dfea11e1e791d0343ccc7d560f03710f5c1e2a98 (diff) | |
| parent | d7c591915893c8c572e9135db4ec27dc174823fd (diff) | |
| download | gitlab-ce-d4677353b84681bd73f321a0b04bb7eba32dbc9c.tar.gz | |
Merge branch 'revert-lock-for-issuable' into 'master'
Revert "Optimistic locking for Issue and Merge Requests"
The migration to add `lock_version` in !5146 to every issue and merge request takes too long on GitLab.com since it has to add a default value of 0 to every row. Unfortunately, Rails 4.2 doesn't work properly if the value is left as `nil`; anything using optimistic locking cannot be edited.
This bug was fixed in Rails 5.0 via this commit: https://github.com/rails/rails/commit/13772bfa49325a8dc26410d2dcb555665a320f92. I suggest we revert this change for now, and when we upgrade to Rails 5.0 we can reintroduce this feature.
See merge request !5245
Diffstat (limited to 'features/project')
| -rw-r--r-- | features/project/merge_requests.feature | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/features/project/merge_requests.feature b/features/project/merge_requests.feature index 8176ec5ab45..21768c15c17 100644 --- a/features/project/merge_requests.feature +++ b/features/project/merge_requests.feature @@ -89,7 +89,7 @@ Feature: Project Merge Requests Then The list should be sorted by "Oldest updated" @javascript - Scenario: Visiting Merge Requests from a different Project after sorting + Scenario: Visiting Merge Requests from a differente Project after sorting Given I visit project "Shop" merge requests page And I sort the list by "Oldest updated" And I visit dashboard merge requests page |