delta/gitlab/gitlab-ce.git/features/project/merge_requests.feature, branch koding-setting-api gitlab.com: gitlab-org/gitlab-ce.git Merge branch 'dz-merge-request-version' 2016-08-25T17:59:21+00:00 Douwe Maan douwe@selenight.nl 2016-08-25T17:59:21+00:00 bbd9a6fe405d0df1c7c9ad09b7c3ff6a0201953f 






Revert the revert of Optimistic Locking
2016-08-22T15:43:13+00:00

Valery Sizov
valery@gitlab.com

2016-08-01T15:34:17+00:00

8f9a7ca854ffda26c5ce9aed2aec10bf155d0463












Revert "Merge branch '19957-write-tests-for-adding-comments-for-different-line-types-in-diff' into 'master'"
2016-08-16T16:14:54+00:00

Rubén Dávila Santos
ruben@gitlab.com

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

b44b09b302e6f4d19c7e6b2dac3be62fe83b31b2

This reverts merge request !5417




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

Robert Speicher
robert@gitlab.com

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

12918b0b9e99449181ce6f24c9bdb5d58ae6b89a


Add rspec feature tests for the diff notes feature.

## What are the relevant issue numbers?

Closes #19957.

See merge request !5417





Add rspec feature tests for the diff notes feature.

## What are the relevant issue numbers?

Closes #19957.

See merge request !5417






Merge branch 'master' into dz-merge-request-version
2016-08-15T14:27:22+00:00

Dmitriy Zaporozhets
dmitriy.zaporozhets@gmail.com

2016-08-15T14:27:22+00:00

5e95c0b8d201a6bfdd020aa29a5a6e14c7085e3f

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>





Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>







Moved notes scenarios to 'diff_notes_spec.rb'
2016-08-05T12:56:26+00:00

Luke Bennett
lukeeeebennettplus@gmail.com

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

0013e59fef7fa21e1f24796ad5c97973bf04e0e3












Add unfold links for Side-by-Side view
2016-08-04T06:09:59+00:00

Tim Masliuchenko
insside@gmail.com

2016-07-21T18:44:12+00:00

b6d545df51d7c3b4e572b40cdafb7efeb78edaf4












Chnage the way how merge request diff is initialized and saved
2016-08-02T12:38:03+00:00

Dmitriy Zaporozhets
dmitriy.zaporozhets@gmail.com

2016-08-02T12:38:03+00:00

6515ec09bbfa25027d1b8a1240e09bc1c6edbcfb

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>





Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>







Revert "Optimistic locking for Issue and Merge Requests"
2016-07-14T02:17:17+00:00

Stan Hu
stanhu@gmail.com

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

d7c591915893c8c572e9135db4ec27dc174823fd

This reverts commit c39356998b1850f3dc26fe0b987cb419c1d1afb4.





This reverts commit c39356998b1850f3dc26fe0b987cb419c1d1afb4.







Optimistic locking for Issue and Merge Requests
2016-07-12T16:52:14+00:00

Valery Sizov
valery@gitlab.com

2016-07-07T21:42:16+00:00

c39356998b1850f3dc26fe0b987cb419c1d1afb4