kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity
gitlab-org--gitlab-foss/spec
History
Douwe Maan 51dca778ed 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
 		2016-08-23 00:33:58 +00:00
..
config Small refactor and a few documentation fixes 2016-08-04 19:02:39 +02:00
controllers Merge branch '17932-move-to-project-dropdown' into 'master' 2016-08-19 14:57:09 +00:00
factories Add endpoints for pipelines 2016-08-18 16:56:39 +02:00
features Merge branch 'revert_revert_issuable_lock' into 'master' 2016-08-23 00:33:58 +00:00
finders Merge branch 'issue_18135' into 'master' 2016-08-19 23:06:30 +00:00
fixtures Fix JSON schema to issues in issue board lists 2016-08-19 11:47:33 -03:00
helpers Merge remote-tracking branch 'upstream/master' into wall-clock-time-for-showing-pipeline 2016-08-20 00:09:58 +08:00
initializers Give priority to environment variables 2016-08-03 15:48:48 +01:00
javascripts Merge branch 'lbennett/gitlab-ce-17465-search-for-project-with-cursor-keys' into 'master' 2016-08-19 19:36:47 +00:00
lib Merge branch 'metrics-typo' into 'master' 2016-08-22 13:15:15 +00:00
mailers Merge branch 'master' into 'expiration-date-on-memberships' 2016-08-19 10:58:01 +00:00
models Fix Error 500 resulting when loading network graph 2016-08-20 09:57:20 -07:00
requests Merge branch 'master' into expiration-date-on-memberships 2016-08-18 19:04:31 -05:00
routing Support integration with Koding (online IDE) 2016-08-19 12:10:58 -07:00
services Merge branch 'mark-as-processable' into 'master' 2016-08-19 18:35:07 +00:00
support Merge branch '4273-slash-commands' into 'master' 2016-08-18 16:41:16 -05:00
tasks/gitlab Use `File::exist?` instead of `File::exists?` 2016-08-11 13:54:45 +03:00
uploaders Remove VideoJS and clean the integration 2016-07-20 11:36:42 +02:00
views Update Hamlit to 2.6.1 2016-08-18 13:26:32 -05:00
workers Merge branch '21010-emailsonpushworker-incorrectly-claims-deleted-a-commit-after-a-push' into 'master' 2016-08-19 18:16:55 +00:00
factories_spec.rb adds second batch of tests changed to active tense 2016-08-09 15:11:39 +01:00
rails_helper.rb
…
simplecov_env.rb Bump SimpleCov merge timeout to 365 days 2016-08-22 13:44:14 +02:00
spec_helper.rb Use travel_to instead of dependency injection, feedback: 2016-08-19 16:57:25 +08:00
teaspoon_env.rb Add test coverage analysis for CoffeeScript (!5052) 2016-08-07 21:52:37 +02:00