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/git/conflict
AgeCommit message (Expand)Author
2021-08-19Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42GitLab Bot
2021-06-16Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42GitLab Bot
2021-05-19Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42GitLab Bot
2018-11-13Enable even more frozen string in lib/gitlabgfyoung
2018-10-30Move Repository#wrapped_gitaly_errors into concernBob Van Landuyt
2018-07-27More Gitaly cleanup: fetch_ref, allow disk access blocksJacob Vosmaer (GitLab)
2018-07-06Partially rever "Revert "Merge branch 'gitaly-mandatory-20180703-jv' into 'ma...Jacob Vosmaer
2018-07-05Revert "Merge branch 'gitaly-mandatory-20180703-jv' into 'master'"Jacob Vosmaer (GitLab)
2018-07-04Make more Gitaly features mandatoryJacob Vosmaer (GitLab)
2018-04-06Fix 500 error when MR from fork has conflicts but worker has not runSean McGivern
2018-03-23Fix 500 error when trying to resolve non-ASCII conflicts in editorSean McGivern
2018-01-11Migrate Repository#can_be_merged? to GitalyAhmad Sherif
2018-01-02Simplify conflict resolution interface and codeAlejandro Rodríguez
2017-12-27Incorporate ConflictsService.ResolveConflicts Gitaly RPCAlejandro Rodríguez
2017-12-27Incorporate ConflictsService.ListConflictFiles Gitaly RPCAlejandro Rodríguez
2017-12-14Simplify conflict resolver interfaceAlejandro Rodríguez
2017-12-04Use `String#end_with?` instead of `String#ends_with?`Alejandro Rodríguez
2017-12-04Add missing attr_accessor to Gitlab::Git::Conflict::FileAlejandro Rodríguez
2017-10-13Move line code generation into Gitlab::GitAlejandro Rodríguez
2017-10-13Create a Gitlab::Git submodule for conlict-related filesAlejandro Rodríguez
    generated by cgit v1.2.3 (git 2.25.1) at 2024-08-09 07:07:36 +0300