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.rb
AgeCommit message (Expand)Author
2022-12-02Add latest changes from gitlab-org/gitlab@masterGitLab Bot
2021-07-28Add latest changes from gitlab-org/gitlab@masterGitLab Bot
2021-07-22Add latest changes from gitlab-org/gitlab@masterGitLab Bot
2020-12-17Add latest changes from gitlab-org/gitlab@masterGitLab Bot
2020-11-13Add latest changes from gitlab-org/gitlab@masterGitLab Bot
2018-11-07Enable even more frozen string in lib/gitlabgfyoung
2018-10-30Make Highlight accept language paramMark Chao
2018-10-13Remove dependencies on LinguistZeger-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-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-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-08-25Handle case where conflicts aren't on disk yetSean 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-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-12Highlight files based on merged fileSean McGivern
2016-08-12Add match line headersSean McGivern
2016-08-12Handle conflict resolution errors in controllerSean McGivern
2016-08-12Auto-highlight conflict when rich_text is calledSean 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-08-06 23:24:20 +0300