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
path: root/lib/gitlab/conflict/file_collection.rb
AgeCommit message (Expand)Author
2021-08-19Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42GitLab Bot
2020-10-21Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42GitLab Bot
2018-11-07Enable even more frozen string in lib/gitlabgfyoung
2018-03-23Fix 500 error when trying to resolve non-ASCII conflicts in editorSean McGivern
2018-03-08Cache `#can_be_resolved_in_ui?` git operationsAlejandro Rodríguez
2018-01-02Simplify conflict resolution interface and codeAlejandro Rodríguez
2017-12-14Simplify conflict resolver interfaceAlejandro Rodríguez
2017-12-12Use memoization for commits on diffsZeger-Jan van de Weg
2017-10-13Create a Gitlab::Git submodule for conlict-related filesAlejandro Rodríguez
2017-10-13Refactor conflict resolution to contain git ops within Gitlab::GitAlejandro Rodríguez
2017-10-13Encapsulate git operations for conflict resolution into libAlejandro Rodríguez
2017-08-31Prepare GitOperationService for move to Gitlab::GitJacob Vosmaer
2017-08-08Incorporate Gitaly's CommitService.FindCommit RPCAlejandro Rodríguez
2017-06-21Enable Style/DotPosition Rubocop :cop:Grzegorz Bizon
2017-05-12Fix conflict resolution from corrupted upstreamSean McGivern
2017-03-01Enable and autocorrect the CustomErrorClass copSean McGivern
2016-10-13Allow setting content for resolutionsSean McGivern
2016-08-12Add more tests for conflictsSean McGivern
2016-08-12Move resolving code to ResolveServiceSean McGivern
2016-08-12Add blob_path to conflict file JSONSean McGivern
2016-08-12Use same resolution format on FE and BESean McGivern
2016-08-12Fix specsSean McGivern
2016-08-12Handle case where one side deleted the fileSean McGivern
2016-08-12Remove unneeded raiseSean McGivern
2016-08-12Fix MR conflict resolution commitsSean McGivern
2016-08-12Fix merge conflict reading for new diffsSean McGivern
2016-08-12Allow resolving conflicts in MR controllerSean McGivern
2016-08-12Handle multiple merge conflict files in collectionSean McGivern
    generated by cgit v1.2.3 (git 2.25.1) at 2024-08-09 03:49:26 +0300