delta/gitlab/gitlab-ce.git/features/project, branch test-gitlab-git

Revert "Merge branch '19957-write-tests-for-adding-comments-for-different-line-types-in-diff' into 'master'"

2016-08-16T16:14:54+00:00

This reverts merge request !5417

Merge branch '19957-write-tests-for-adding-comments-for-different-line-types-in-diff' into 'master'

2016-08-15T22:22:51+00:00


Add rspec feature tests for the diff notes feature.

## What are the relevant issue numbers?

Closes #19957.

See merge request !5417

Moved notes scenarios to 'diff_notes_spec.rb'

2016-08-05T12:56:26+00:00

Add unfold links for Side-by-Side view

2016-08-04T06:09:59+00:00

Add a spec for #20079.

2016-07-22T02:55:59+00:00

The issue was fixed in 2ba5e62. The spec is going in separately just
so the fix could go in as soon as possible.

Revert "Merge branch 'gl-dropdown-issuable-form' into 'master'"

2016-07-15T23:46:29+00:00

This reverts merge request !4970

Merge branch 'revert-lock-for-issuable' into 'master'

2016-07-15T18:29:50+00:00


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

Merge branch 'gl-dropdown-issuable-form' into 'master'

2016-07-15T02:29:10+00:00


GL dropdowns in issuable form

## What does this MR do?

Changed all the issuable dropdown menus over to user GL dropdowns. This brings the dropdowns to be inline with the issuable filter dropdowns and allows for labels to be created whilst creating/editing an issuable.

## What are the relevant issue numbers?

Closes #12574 

## Screenshots (if relevant)


See merge request !4970

Revert "Optimistic locking for Issue and Merge Requests"

2016-07-14T02:17:17+00:00

This reverts commit c39356998b1850f3dc26fe0b987cb419c1d1afb4.

Optimistic locking for Issue and Merge Requests

2016-07-12T16:52:14+00:00