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
AgeCommit message (Expand)Author
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-13Move line code generation into Gitlab::GitAlejandro Rodríguez
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-13Move Gitlab::Diff::LineCode to module Gitlab::GitAlejandro Rodríguez
2017-10-13Encapsulate git operations for conflict resolution into libAlejandro Rodríguez
2017-09-12Decrease Cyclomatic Complexity threshold to 13Maxim Rydkin
2017-08-31Prepare GitOperationService for move to Gitlab::GitJacob Vosmaer
2017-08-08Incorporate Gitaly's CommitService.FindCommit RPCAlejandro Rodríguez
2017-07-07Include new URL helpers retroactively into includers of Gitlab::RoutingDouwe Maan
2017-07-05Create and use project path helpers that only need a project, no namespaceDouwe Maan
2017-06-21Enable Style/DotPosition Rubocop :cop:Grzegorz Bizon
2017-05-12Fix conflict resolution from corrupted upstreamSean McGivern
2017-03-15Allow resolving conflicts with non-ASCII charsSean McGivern
2017-03-01Enable and autocorrect the CustomErrorClass copSean McGivern
2017-02-23Fix code for copsDouwe Maan
2017-02-23Enable Style/ConditionalAssignmentDouwe Maan
2016-10-13Add blob_ace_mode to conflict content responseSean McGivern
2016-10-13Simplify conflict file JSON creationSean McGivern
2016-10-13Allow setting content for resolutionsSean McGivern
2016-09-07Fix merge conflict size limitSean McGivern
2016-08-25Merge branch '21247-mergerequestscontroller-conflicts-may-fail-with-iso-8859-...Robert Speicher
2016-08-25Handle case where conflicts aren't on disk yetSean McGivern
2016-08-25Handle non-UTF-8 conflicts gracefullySean McGivern
2016-08-12Fix bug where conflict view would have one too many context sectionsDouwe Maan
2016-08-12Find match line headers by backtrackingSean McGivern
2016-08-12Add more tests for conflictsSean McGivern
2016-08-12Move resolving code to ResolveServiceSean McGivern
2016-08-12Clarify Conflict::File#sections methodSean McGivern
2016-08-12Don't allow resolving invalid conflictsSean McGivern
2016-08-12Add blob_icon to conflict file JSONSean 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-12Fix match line headers at start / end of fileSean McGivern
2016-08-12Handle case where one side deleted the fileSean McGivern
2016-08-12Highlight files based on merged fileSean McGivern
2016-08-12Remove unneeded raiseSean McGivern
2016-08-12Add match line headersSean McGivern
2016-08-12Raise errors for large and binary filesSean McGivern
2016-08-12Handle conflict resolution errors in controllerSean McGivern
2016-08-12Fix MR conflict resolution commitsSean McGivern
2016-08-12Auto-highlight conflict when rich_text is calledSean 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
2016-08-12Add backend for merge conflicts readingSean McGivern
    generated by cgit v1.2.3 (git 2.25.1) at 2024-07-11 19:35:30 +0300