summaryrefslogtreecommitdiff
path: root/lib/gitlab/gitaly_client
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'repository-log-disable-walk' into 'master'Douwe Maan2018-01-311-1/+1
|\
| * Remove Rugged::Walk implementation of #logrepository-log-disable-walkJacob Vosmaer2018-01-311-1/+1
* | Merge branch 'zj-gitaly-server-info' into 'master'Sean McGivern2018-01-311-0/+16
|\ \ | |/ |/|
| * Gitaly Server info for admin panelZeger-Jan van de Weg2018-01-311-0/+16
* | Merge branch 'fix/add-support-for-pre-receive-error-in-merge-branch' into 'ma...42613-clean-up-old-project-permissions-frontend-code42242-clean-up-error-handling-in-project-permissions-pageRobert Speicher2018-01-301-1/+7
|\ \
| * | Add support for PreReceiveError in UserMergeBranch RPCfix/add-support-for-pre-receive-error-in-merge-branchAhmad Sherif2018-01-301-1/+7
* | | Migrate Git::Repository#delete_refs to Gitalyfeature/migrate-delete-refs-to-gitalyAhmad Sherif2018-01-301-3/+6
|/ /
* | Merge branch 'feature/migrate-wiki-page-formatted-data-to-gitaly' into 'master'Robert Speicher2018-01-301-0/+12
|\ \
| * | Migrate fetching wiki page formatted content to Gitalyfeature/migrate-wiki-page-formatted-data-to-gitalyAhmad Sherif2018-01-301-0/+12
| |/
* | Migrate Git::Repository#write_ref to Gitalygitaly-784-repo-write-refKim "BKC" Carlbäcker2018-01-301-0/+16
|/
* Merge branch 'feature/migrate-repo-restorer-to-gitaly' into 'master'Robert Speicher2018-01-251-0/+25
|\
| * Migrate restoring repo from bundle to Gitalyfeature/migrate-repo-restorer-to-gitalyAhmad Sherif2018-01-241-0/+25
* | Merge branch 'lint-rugged' into 'master'Rémy Coutable2018-01-251-6/+14
|\ \
| * | Look for rugged with static analysislint-ruggedJacob Vosmaer2018-01-251-6/+14
* | | Fix .batch_lfs_pointers accepting a lazy enumeratorfix/batch-lfs-pointers-accepting-lazy-enumAhmad Sherif2018-01-251-0/+2
|/ /
* | Merge branch '42161-gitaly-commitservice-encoding-undefinedconversionerror-u-...Rémy Coutable2018-01-251-2/+2
|\ \
| * | Make sure we're passing ASCII-8BIT to Gitaly42161-gitaly-commitservice-encoding-undefinedconversionerror-u-c124-from-utf-8-to-ascii-8bitLin Jen-Shin2018-01-231-2/+2
* | | Add a gRPC health check to ensure Gitaly is upsh-add-gitaly-health-checkStan Hu2018-01-241-0/+19
* | | Migrate .batch_lfs_pointers to Gitalyfeature/migrate-get-lfs-ptrs-to-gitalyAhmad Sherif2018-01-241-0/+20
| |/ |/|
* | Migrate repository bundling to Gitalyfeature/migrate-bundle-to-disk-to-gitalyAhmad Sherif2018-01-241-0/+17
* | GitalyClient::ConflictsService#conflicts? should return true for conflicts wi...fix/gitaly-can-be-merged-for-missing-conflict-filesAhmad Sherif2018-01-231-0/+5
* | Merge branch 'gitaly-update-remote-mirror' into 'master'Rémy Coutable2018-01-231-0/+27
|\ \
| * | Incorporate Gitaly's RemoteService.UpdateRemoteMirror RPCgitaly-update-remote-mirrorAlejandro Rodríguez2018-01-221-0/+27
| |/
* | Incorporate Gitaly's OperationService.UserCommitFiles RPCgitaly-user-commit-filesAlejandro Rodríguez2018-01-221-0/+72
|/
* Retrieve commit signatures with GitalyJacob Vosmaer (GitLab)2018-01-181-0/+17
* Migrate importing repository to Gitalyfeature/migrate-import-repository-to-gitalyAhmad Sherif2018-01-152-1/+16
* Merge branch 'feature/migrate-can-be-merged-to-gitaly' into 'master'Grzegorz Bizon2018-01-152-33/+52
|\
| * Migrate Repository#can_be_merged? to Gitalyfeature/migrate-can-be-merged-to-gitalyAhmad Sherif2018-01-112-33/+52
* | Merge branch 'feature/migrate-is-rebase-in-progress-to-gitaly' into 'master'Robert Speicher2018-01-111-0/+17
|\ \
| * | Migrate rebase_in_progress? to Gitalyfeature/migrate-is-rebase-in-progress-to-gitalyAhmad Sherif2018-01-101-0/+17
* | | Merge branch 'feature/migrate-rebase-to-gitaly' into 'master'Robert Speicher2018-01-111-0/+28
|\ \ \
| * | | Migrate Gitlab::Git::Repository#rebase to Gitalyfeature/migrate-rebase-to-gitalyAhmad Sherif2018-01-101-0/+28
| |/ /
* | | Adds Rubocop rule for line break around conditionals🙈 jacopo beschi 🙉2018-01-111-0/+1
* | | Migrate merged_branch_names to GitalyAhmad Sherif2018-01-111-8/+23
|/ /
* | Add support for multiple refmaps to RemoteService#add_remotefix/use-mirror-refmaps-instead-mirror-refmapAhmad Sherif2018-01-091-3/+5
|/
* Merge branch '41683-timeout-is-not-set-for-gitaly-fetch_remote-calls' into 'm...Stan Hu2018-01-081-2/+5
|\
| * Pass timeout to RepositoryService.FetchRemote Gitaly RPC calls41683-timeout-is-not-set-for-gitaly-fetch_remote-callsAlejandro Rodríguez2018-01-051-2/+5
* | Merge branch 'gitaly-fetch-internal-remote' into 'master'Sean McGivern2018-01-081-0/+13
|\ \ | |/ |/|
| * Incorporate RemoteService.FetchInternalRemote Gitaly RPCgitaly-fetch-internal-remoteAlejandro Rodríguez2018-01-051-0/+13
* | Merge branch 'gitaly-merge-nil' into 'master'Sean McGivern2018-01-041-0/+1
|\ \
| * | Fix method lookupJacob Vosmaer2018-01-031-1/+3
| * | Handle Gitaly aborted merge due to branch updateJacob Vosmaer2018-01-031-0/+1
* | | Merge branch 'feature/add-max-count-to-count-commits-rpc' into 'master'Rémy Coutable2018-01-041-0/+1
|\ \ \ | |_|/ |/| |
| * | Add support for max_count option to Git::Repository#count_commitsfeature/add-max-count-to-count-commits-rpcAhmad Sherif2017-12-271-0/+1
* | | Merge branch 'migrate-fork-repo-to-gitaly' into 'master'Robert Speicher2018-01-032-1/+17
|\ \ \
| * | | Migrate repo forking to Gitalymigrate-fork-repo-to-gitalyAhmad Sherif2018-01-022-1/+17
| |/ /
* | | Fix method lookupfix-encoding-method-lookupJacob Vosmaer2018-01-031-1/+3
| |/ |/|
* | Merge branch 'gitaly-conflict-resolver' into 'master'Grzegorz Bizon2018-01-032-0/+99
|\ \
| * | Simplify conflict resolution interface and codegitaly-conflict-resolverAlejandro Rodríguez2018-01-021-40/+35
| * | Incorporate ConflictsService.ResolveConflicts Gitaly RPCAlejandro Rodríguez2017-12-271-4/+42