| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'osw-stop-recalculating-merge-base-on-mr-loading' into 'master' | Sean McGivern | 2018-03-13 | 1 | -2/+7 |
| | | | | | | Avoid re-fetching merge-base SHA from Gitaly unnecessarily See merge request gitlab-org/gitlab-ce!17630 | ||||
| * | Ensure MRs always use branch refs for comparison | Sean McGivern | 2017-11-28 | 1 | -6/+6 |
| | | | | | | | | | | | If a merge request was created with a branch name that also matched a tag name, we'd generate a comparison to or from the tag respectively, rather than the branch. Merging would still use the branch, of course. To avoid this, ensure that when we get the branch heads, we prepend the reference prefix for branches, which will ensure that we generate the correct comparison. | ||||
| * | Prepare GitOperationService for move to Gitlab::Git | Jacob Vosmaer | 2017-08-31 | 1 | -20/+2 |
| | | |||||
| * | Fix Diff::Position#diff_file for positions on straight diffsdm-diff-file-straight-diff | Douwe Maan | 2017-06-06 | 1 | -3/+3 |
| | | |||||
| * | Rename from base to start because base could mean merge base | Lin Jen-Shin | 2017-01-06 | 1 | -6/+6 |
| | | |||||
| * | Rename source to base to avoid confusion from MR | Lin Jen-Shin | 2017-01-06 | 1 | -6/+6 |
| | | |||||
| * | Introduce Repository#with_repo_branch_commit | Lin Jen-Shin | 2017-01-05 | 1 | -12/+6 |
| | | | | | | | | | | We merge repository checks inside it so we don't have to check it on the call site, and we could also load the commit for the caller. This greatly reduce code duplication. Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7237#note_20572919 | ||||
| * | Should pass branch name, not commit object! | Lin Jen-Shin | 2016-12-10 | 1 | -5/+6 |
| | | |||||
| * | Should pass repository rather than project | Lin Jen-Shin | 2016-12-08 | 1 | -1/+2 |
| | | |||||
| * | Fix tests to use the new API | Lin Jen-Shin | 2016-12-08 | 1 | -6/+8 |
| | | |||||
| * | Introduce Repository#with_tmp_ref which we need | Lin Jen-Shin | 2016-12-08 | 1 | -12/+18 |
| | | | | | | commits from the other repository. We'll cleanup the tmp ref after we're done with our business. | ||||
| * | Refactor straight compare diff code | Dmitriy Zaporozhets | 2016-10-12 | 1 | -2/+2 |
| | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Use straight diff approach when compare merge request versions | Dmitriy Zaporozhets | 2016-10-12 | 1 | -3/+4 |
| | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | switch from diff_file_collection to diffs20034-safe-diffs | Paco Guzman | 2016-08-03 | 1 | -1/+0 |
| | | | | | So we have raw_diffs too | ||||
| * | Introduce Compare model in the codebase. | Paco Guzman | 2016-08-03 | 1 | -2/+5 |
| | | | | This object will manage Gitlab::Git::Compare instances | ||||
| * | Remove unused argument to CompareService#execute | Sean McGivern | 2016-07-08 | 1 | -1/+1 |
| | | |||||
| * | Use Gitlab::Git::DiffCollections | Jacob Vosmaer | 2016-03-03 | 1 | -7/+5 |
| | | |||||
| * | Add ignore white space option in merge request diff | Minsik Yoon | 2015-11-13 | 1 | -2/+2 |
| | | | | | | | fix this issue(https://gitlab.com/gitlab-org/gitlab-ce/issues/1393). Add ignore whitespace optoin to Commits Compare view | ||||
| * | Fix Error 500 when comparing non-existing branchesfix-issue-2593 | Stan Hu | 2015-09-18 | 1 | -1/+4 |
| | | | | | Closes #2593 | ||||
| * | Revert "Merge branch 'revert-satellites' into 'master' " | Dmitriy Zaporozhets | 2015-08-11 | 1 | -20/+21 |
| | | | | | | This reverts commit 5daf44b7c86e0e2641a902b1da8b01d91fa3dbfa, reversing changes made to 2f706fbd231cabe7a76a5d17ac44285aaaf8592c. | ||||
| * | Revert "Merge branch 'drop-satellites'" | Dmitriy Zaporozhets | 2015-08-11 | 1 | -21/+20 |
| | | | | | | | | This reverts commit 957e849f41d96fa9778fcdd06792d2f0274b29ab, reversing changes made to 6b9dbe9f5a175a8162abf296367f561bab3eea1a. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Refactor compare and fetch logic | Dmitriy Zaporozhets | 2015-07-15 | 1 | -20/+13 |
| | | |||||
| * | Implement merge from forks without satellites | Dmitriy Zaporozhets | 2015-07-15 | 1 | -1/+18 |
| | | |||||
| * | Remove satellites | Dmitriy Zaporozhets | 2015-07-15 | 1 | -10/+1 |
| | | |||||
| * | Comment typo. | Ciro Santilli | 2014-08-29 | 1 | -1/+1 |
| | | |||||
| * | Comment typo. | Ciro Santilli | 2014-08-29 | 1 | -1/+1 |
| | | |||||
| * | Git::Compare does not have limit param any more | Dmitriy Zaporozhets | 2014-07-29 | 1 | -1/+0 |
| | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Refactor compare logic for MR. Use satellites only for forks for better ↵ | Dmitriy Zaporozhets | 2014-07-29 | 1 | -0/+28 |
| performance Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |