Robert Speicher d4677353b8 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: 13772bfa49. 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		2016-07-15 18:29:50 +00:00
..
assets	Merge branch 'collapse-diffs-more' into 'master'	2016-07-15 13:49:10 +00:00
controllers	Revert "Optimistic locking for Issue and Merge Requests"	2016-07-13 19:17:17 -07:00
finders	Merge branch 'approval-required-todo' into 'master'	2016-07-12 19:50:33 +00:00
helpers	Merge branch 'update-permissions-links' into 'master'	2016-07-15 09:59:16 +00:00
mailers	Display new diff notes and allow creation through the web interface	2016-07-06 18:51:00 -04:00
models	Merge branch 'revert-lock-for-issuable' into 'master'	2016-07-15 18:29:50 +00:00
services	Merge branch 'fix/persistent-import-data' into 'master'	2016-07-14 14:50:34 +00:00
uploaders	Enable Style/SpaceAfterComma Rubocop cop	2016-06-29 15:23:44 +02:00
validators	refactor url validator to use sanitizer for check	2016-07-01 09:02:45 +02:00
views	Merge branch 'revert-lock-for-issuable' into 'master'	2016-07-15 18:29:50 +00:00
workers	Refresh branch cache after git gc	2016-07-13 06:49:58 -07:00