5cce1278ad
Correctly determine MR diff base when MR has merge conflicts
2016-01-27 17:23:59 +01:00
577f2fb47a
Save and use actual diff base commit for MR diff highlighting
2016-01-20 18:44:27 +01:00
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
8710739e4e
Correctly find last known blob for file deleted in MR.
2015-10-20 14:24:02 +02:00
2611d9f63c
Add a system note and update relevant merge requests when a branch is deleted or re-added
...
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
2015-10-15 23:54:13 -07:00
2b075f16c7
Fix rubocop warnings in app
2015-10-03 00:56:37 -05:00
a44ca15c1d
Fix Error 500 in creating merge requests with > 1000 diffs
...
Closes #2692
2015-09-25 02:40:34 -07:00
3e259ea8bc
Revert "Merge branch 'revert-satellites' into 'master'
"
...
This reverts commit 5daf44b7c82f706fbd23
2015-08-11 14:33:31 +02:00
9f10943c1a
Revert "Merge branch 'drop-satellites'"
...
This reverts commit 957e849f416b9dbe9f5a
2015-08-11 10:28:42 +02:00
84727fba96
Revert "Merge branch 'improve-merge-requests' into 'master'
"
...
This reverts commit 4773f38e280d5d80b735
2015-08-11 10:26:19 +02:00
86bccb71a1
Create ref for every merge request. Add documentation for fetch merge requests
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-07 12:54:58 +02:00
971e47520f
Increase COMMITS_SAFE_SIZE to reasonable size in compare to diff limits. Fix reload with full diff link
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-16 16:32:43 +02:00
26f5d6047d
Refactor compare and fetch logic
2015-07-15 17:28:09 +02:00
cb6f34e367
Implement update of ref when merge request code is reloaded
2015-07-15 16:52:50 +02:00
2a6f522cac
Implement merge from forks without satellites
2015-07-15 16:45:50 +02:00
84a1590252
Let commit model know about its project.
2015-04-24 12:29:36 +02:00
62ed1c537e
Explicitly define ordering in models using default_scope
2015-02-05 14:20:55 -08:00
0189be0831
Use short_id instead of [0..N] for short version of commit sha
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-10 15:39:48 +03:00
92deb451da
Annotate models
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-08-25 12:25:02 +03:00
098ee55e3c
Use CompareService in collecting diff when create MR
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-29 12:21:03 +03:00
cb74c014ea
Key strong params
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-26 17:00:05 +03:00
4fea8afc4b
Add CompareAction class for collecting commits and diffs using satellites
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-07 16:14:24 +03:00
36f861f1b1
Re-annotate models
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-09 15:05:03 +03:00
5c3972ae1e
remove dead code: broken_diffs
2014-02-27 14:58:27 +08:00
0bcabdaf83
Use gitlab_git 5.4.0 without BROKEN_DIFF constant
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-12 12:54:49 +02:00
39a86963e9
Set mr_diff state to collected if diff is ok
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-22 15:30:14 +02:00
d9be420ee6
MergeRequestDiff model responsoible for storing commits/diff info
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-22 15:19:02 +02:00
Douwe Maan