Commit graph

16 commits

Author SHA1 Message Date
Jacob Vosmaer
1764e1b7cb Use Gitlab::Git::DiffCollections 2016-03-03 18:38:44 +01:00
Rubén Dávila
5bb5019e04 Use adequate description for new MR. 2016-02-19 13:14:49 -05: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
ab8c71de4e
Fix merge request creation without branch selected
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-05 11:03:41 +02:00
Dmitriy Zaporozhets
26f5d6047d Refactor compare and fetch logic 2015-07-15 17:28:09 +02:00
Dmitriy Zaporozhets
a87989fb7d Remove satellites 2015-07-15 15:45:57 +02:00
Douwe Maan
84a1590252 Let commit model know about its project. 2015-04-24 12:29:36 +02:00
Douwe Maan
2f76ccdfac Base new MR description on commit description if there's only one. 2015-02-20 22:17:38 +01:00
Douwe Maan
8830cfaa60 Base new MR title on commit title if there's only one. 2015-02-20 15:06:06 +01:00
Drew Blessing
aacf07467c Merge request error display.
Fixes #8432
2014-12-26 15:54:12 -06: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
Dmitriy Zaporozhets
ddaa493ef3
Improve MR building
* fix 500 error when no parent for initial commit
* fix link from diff files to wrong commit

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-28 20:54:40 +03:00
Dmitriy Zaporozhets
9879c427ce
If MR commits are empty if does not mean compare failed
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-15 23:04:14 +03:00
Dmitriy Zaporozhets
be5b6db883
Refactor diff suppress logic and diff views
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-15 18:28:21 +03:00
Dmitriy Zaporozhets
45623089e2
Refactor MR build process
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-15 15:34:06 +03:00