Commit graph

12 commits

Author SHA1 Message Date
Jacob Vosmaer
1764e1b7cb Use Gitlab::Git::DiffCollections 2016-03-03 18:38:44 +01:00
Minsik Yoon
3d0efa8e0a Add ignore white space option in merge request diff
fix this issue(https://gitlab.com/gitlab-org/gitlab-ce/issues/1393).

Add ignore whitespace optoin to Commits Compare view
2015-11-13 16:53:53 +09:00
Stan Hu
de8497ca56 Fix Error 500 when comparing non-existing branches
Closes #2593
2015-09-18 12:02:01 -07:00
Dmitriy Zaporozhets
3e259ea8bc Revert "Merge branch 'revert-satellites' into 'master' "
This reverts commit 5daf44b7c8, reversing
changes made to 2f706fbd23.
2015-08-11 14:33:31 +02:00
Dmitriy Zaporozhets
9f10943c1a
Revert "Merge branch 'drop-satellites'"
This reverts commit 957e849f41, reversing
changes made to 6b9dbe9f5a.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-11 10:28:42 +02:00
Dmitriy Zaporozhets
26f5d6047d Refactor compare and fetch logic 2015-07-15 17:28:09 +02:00
Dmitriy Zaporozhets
2a6f522cac Implement merge from forks without satellites 2015-07-15 16:45:50 +02:00
Dmitriy Zaporozhets
a87989fb7d Remove satellites 2015-07-15 15:45:57 +02:00
Ciro Santilli
af7b19003c Comment typo. 2014-08-29 20:11:57 +02:00
Ciro Santilli
5317c26cf7 Comment typo. 2014-08-29 19:35:04 +02:00
Dmitriy Zaporozhets
2f780af246
Git::Compare does not have limit param any more
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-29 14:29:59 +03:00
Dmitriy Zaporozhets
bf9ce1f4cf
Refactor compare logic for MR. Use satellites only for forks for better performance
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-29 12:11:16 +03:00