delta/gitlab/gitlab-ce.git/app/models/merge_request_diff.rb, branch tutorials_git_tricks gitlab.com: gitlab-org/gitlab-ce.git Correctly determine MR diff base when MR has merge conflicts 2016-01-27T16:23:59+00:00 Douwe Maan douwe@selenight.nl 2016-01-27T16:23:59+00:00 5cce1278adb168cd9fa4f189e3656a59726b4e6c 






Save and use actual diff base commit for MR diff highlighting
2016-01-20T17:44:27+00:00

Douwe Maan
douwe@selenight.nl

2016-01-20T17:44:27+00:00

577f2fb47a7ef57415b78b49d5c746d4e99f6a98












Add ignore white space option in merge request diff
2015-11-13T07:53:53+00:00

Minsik Yoon
yms9654@gmail.com

2015-10-22T00:55:35+00:00

3d0efa8e0a359c84485a0fd7a3317745bf5648b8

fix this issue(https://gitlab.com/gitlab-org/gitlab-ce/issues/1393).

Add ignore whitespace optoin to Commits Compare view





fix this issue(https://gitlab.com/gitlab-org/gitlab-ce/issues/1393).

Add ignore whitespace optoin to Commits Compare view







Correctly find last known blob for file deleted in MR.
2015-10-20T12:24:02+00:00

Douwe Maan
douwe@gitlab.com

2015-10-20T12:23:56+00:00

8710739e4e5d12ac9e2aa88a553cc1e02dc2b2d1












Add a system note and update relevant merge requests when a branch is deleted or re-added
2015-10-16T06:54:13+00:00

Stan Hu
stanhu@gmail.com

2015-10-15T08:41:46+00:00

2611d9f63cb6c22a00eccdac75535f93890b176c

If a branch is deleted with an open merge request, amended offline, and then pushed again,
GitLab doesn't bother to update the merge request even though the last commit ID and/or
code may have changed. This MR ensures that each push will update any relevant merge
requests and adds a system note if this happens as well.

Closes #2926





If a branch is deleted with an open merge request, amended offline, and then pushed again,
GitLab doesn't bother to update the merge request even though the last commit ID and/or
code may have changed. This MR ensures that each push will update any relevant merge
requests and adds a system note if this happens as well.

Closes #2926







Fix rubocop warnings in app
2015-10-03T05:56:37+00:00

Guilherme Garnier
guilherme.garnier@gmail.com

2015-10-03T05:56:37+00:00

2b075f16c7e867ae19a79fb7c59ca6754f9df7bf












Fix Error 500 in creating merge requests with > 1000 diffs
2015-09-25T09:40:34+00:00

Stan Hu
stanhu@gmail.com

2015-09-25T09:39:34+00:00

a44ca15c1dd71381d6b11638003f60253c2d8964

Closes #2692





Closes #2692







Revert "Merge branch 'revert-satellites' into 'master'
"
2015-08-11T12:33:31+00:00

Dmitriy Zaporozhets
dmitriy.zaporozhets@gmail.com

2015-08-11T12:33:31+00:00

3e259ea8bc198b7a5c67bd1e03dc9d44c7dd5854

This reverts commit 5daf44b7c86e0e2641a902b1da8b01d91fa3dbfa, reversing
changes made to 2f706fbd231cabe7a76a5d17ac44285aaaf8592c.





This reverts commit 5daf44b7c86e0e2641a902b1da8b01d91fa3dbfa, reversing
changes made to 2f706fbd231cabe7a76a5d17ac44285aaaf8592c.







Revert "Merge branch 'drop-satellites'"
2015-08-11T08:28:42+00:00

Dmitriy Zaporozhets
dmitriy.zaporozhets@gmail.com

2015-08-11T08:28:42+00:00

9f10943c1a76576ac40d96189a28a4d6123a75d8

This reverts commit 957e849f41d96fa9778fcdd06792d2f0274b29ab, reversing
changes made to 6b9dbe9f5a175a8162abf296367f561bab3eea1a.

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





This reverts commit 957e849f41d96fa9778fcdd06792d2f0274b29ab, reversing
changes made to 6b9dbe9f5a175a8162abf296367f561bab3eea1a.

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







Revert "Merge branch 'improve-merge-requests' into 'master'
"
2015-08-11T08:26:19+00:00

Dmitriy Zaporozhets
dmitriy.zaporozhets@gmail.com

2015-08-11T08:26:19+00:00

84727fba96c6794874e1f94d581408b70e1842a7

This reverts commit 4773f38e28c91dbbb6e5e385e0c403877298bfed, reversing
changes made to 0d5d80b735eb18ae79eb2bfe26c08896d53db414.





This reverts commit 4773f38e28c91dbbb6e5e385e0c403877298bfed, reversing
changes made to 0d5d80b735eb18ae79eb2bfe26c08896d53db414.