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/gitaly_client/conflicts_service.rb
AgeCommit message (Expand)Author
2023-12-19Add latest changes from gitlab-org/gitlab@16-7-stable-eev16.7.0-rc42GitLab Bot
2023-08-18Add latest changes from gitlab-org/gitlab@16-3-stable-eev16.3.0-rc42GitLab Bot
2022-11-17Add latest changes from gitlab-org/gitlab@15-6-stable-eev15.6.0-rc42GitLab Bot
2021-08-19Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42GitLab Bot
2021-07-20Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42GitLab Bot
2021-02-18Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42GitLab Bot
2020-07-20Add latest changes from gitlab-org/gitlab@13-2-stable-eeGitLab Bot
2019-10-18Add latest changes from gitlab-org/gitlab@masterGitLab Bot
2019-09-19Add latest changes from gitlab-org/gitlab@masterGitLab Bot
2019-06-11Force source and target branch to binary modeStan Hu
2019-06-11Fix UTF-8 conversion issues when resolving conflictsStan Hu
2019-04-01Allow streaming io objects into GitalyBob Van Landuyt
2018-11-13Enable even more frozen string in lib/gitlabgfyoung
2018-07-10Make sure ConflictsService does not raise for conflicting submodulesSean McGivern
2018-07-05Updated Gitaly timeout valuesAndrew Newdigate
2018-01-24GitalyClient::ConflictsService#conflicts? should return true for conflicts wi...Ahmad Sherif
2018-01-11Migrate Repository#can_be_merged? to GitalyAhmad Sherif
2018-01-03Fix method lookupJacob Vosmaer
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
    generated by cgit v1.2.3 (git 2.25.1) at 2024-07-15 16:29:23 +0300