Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-06-06Fix Diff::Position#diff_file for positions on straight diffsDouwe Maan
2017-01-06Rename from base to start because base could mean merge baseLin Jen-Shin
2017-01-06Rename source to base to avoid confusion from MRLin Jen-Shin
2017-01-04Introduce Repository#with_repo_branch_commitLin Jen-Shin
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
2016-12-09Should pass branch name, not commit object!Lin Jen-Shin
2016-12-08Should pass repository rather than projectLin Jen-Shin
2016-12-08Fix tests to use the new APILin Jen-Shin
2016-12-08Introduce Repository#with_tmp_ref which we needLin Jen-Shin
commits from the other repository. We'll cleanup the tmp ref after we're done with our business.
2016-10-12Refactor straight compare diff codeDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-10-12Use straight diff approach when compare merge request versionsDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-08-03switch from diff_file_collection to diffsPaco Guzman
So we have raw_diffs too
2016-08-03Introduce Compare model in the codebase.Paco Guzman
This object will manage Gitlab::Git::Compare instances
2016-07-08Remove unused argument to CompareService#executeSean McGivern
2016-03-03Use Gitlab::Git::DiffCollectionsJacob Vosmaer
2015-11-13Add ignore white space option in merge request diffMinsik Yoon
fix this issue(https://gitlab.com/gitlab-org/gitlab-ce/issues/1393). Add ignore whitespace optoin to Commits Compare view
2015-09-18Fix Error 500 when comparing non-existing branchesStan Hu
Closes #2593
2015-08-11Revert "Merge branch 'revert-satellites' into 'master' "Dmitriy Zaporozhets
This reverts commit 5daf44b7c86e0e2641a902b1da8b01d91fa3dbfa, reversing changes made to 2f706fbd231cabe7a76a5d17ac44285aaaf8592c.
2015-08-11Revert "Merge branch 'drop-satellites'"Dmitriy Zaporozhets
This reverts commit 957e849f41d96fa9778fcdd06792d2f0274b29ab, reversing changes made to 6b9dbe9f5a175a8162abf296367f561bab3eea1a. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-15Refactor compare and fetch logicDmitriy Zaporozhets
2015-07-15Implement merge from forks without satellitesDmitriy Zaporozhets
2015-07-15Remove satellitesDmitriy Zaporozhets
2014-08-29Comment typo.Ciro Santilli
2014-08-29Comment typo.Ciro Santilli
2014-07-29Git::Compare does not have limit param any moreDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-29Refactor compare logic for MR. Use satellites only for forks for better ↵Dmitriy Zaporozhets
performance Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>