ca0cf5a3cd
Show 'too many changes' message for merge request
2017-01-12 13:41:29 -02:00
cb6f8cdfc2
Replace references to MergeRequestDiff#commits with st_commits
...
when we care only about the number of commits
We do not have to instantiate all objects in this case.
2016-12-01 12:17:30 +01:00
7421c08ace
Better tests for MergeRequestDiff#compare_with method
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-10-12 16:32:57 +03:00
cdcc11d48f
Improve tests for merge request diff model
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-10-12 16:32:57 +03:00
d1eab555b6
Merge branch '20708-new-branch-is-immediatelly-tagged-as-merged' into 'master'
...
Removes inconsistency regarding tagging immediately as merged once you create a …
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG ) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md )
- [x] API support added
- Tests
- [x] Added for this feature/bug
- [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html )
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides )
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits )
## What are the relevant issue numbers?
Closes #20708
See merge request !6408
2016-10-12 10:17:35 +00:00
c90483406e
refactors tests because of gitlab-test repository changes
2016-10-11 16:33:06 +01:00
d4fab17d7c
Fix Error 500 when viewing old merge requests with bad diff data
...
Customers running old versions of GitLab may have MergeRequestDiffs with
the text ["--broken diff"] due to text generated by gitlab_git 1.0.3.
To avoid the Error 500, verify that each element is a type that gitlab_git
will accept before attempting to create a DiffCollection.
Closes #20776
2016-10-10 13:05:09 -07:00
b0ce4ca110
Add test for MergeRequestDiff#commits_sha, feedback:
...
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6470#note_15856755
2016-09-22 17:36:43 +08:00
d64c15c5c3
Add code improvements to merge request version feature
...
* Add MergeRequestDiff#latest?
* Remove unnecessary variable assignment
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-08-25 10:59:30 +03:00
5e95c0b8d2
Merge branch 'master' into dz-merge-request-version
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-08-15 17:27:22 +03:00
631f59d4e7
change the API on the merge_request_diff model from diffs -> raw_diffs
2016-08-03 23:32:12 +02:00
6515ec09bb
Chnage the way how merge request diff is initialized and saved
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-08-02 15:38:03 +03:00
f8aeb8cdac
Change merge request diff creation from callback to part of the service
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-08-02 13:31:19 +03:00
3c1dca0301
Add more tests to merge_request_diff and improve initialize
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-08-02 13:31:19 +03:00
5266ae87c4
Support renames in diff_for_path actions
2016-07-11 09:31:34 +01:00
b6b26692ea
Collapse large diffs by default
...
When rendering a list of diff files, skip those where the diff is over
10 KB and provide an endpoint to render individually instead.
2016-07-08 10:56:55 +01:00
Felipe Artur