summaryrefslogtreecommitdiff
path: root/lib/gitlab/git
Commit message (Expand)AuthorAgeFilesLines
* Migrate Commit#uri_type to Gitalyfeature/migrate-commit-uri-to-gitalyAhmad Sherif2018-01-151-5/+32
* Merge branch 'feature/migrate-is-rebase-in-progress-to-gitaly' into 'master'Robert Speicher2018-01-111-1/+7
|\
| * Migrate rebase_in_progress? to Gitalyfeature/migrate-is-rebase-in-progress-to-gitalyAhmad Sherif2018-01-101-1/+7
* | Merge branch 'feature/migrate-rebase-to-gitaly' into 'master'Robert Speicher2018-01-111-22/+48
|\ \
| * | Migrate Gitlab::Git::Repository#rebase to Gitalyfeature/migrate-rebase-to-gitalyAhmad Sherif2018-01-101-22/+48
| |/
* | Adds Rubocop rule for line break around conditionals🙈 jacopo beschi 🙉2018-01-112-0/+2
* | Merge branch 'feature/migrate-merged-branch-names-to-gitaly' into 'master'RĂ©my Coutable2018-01-111-9/+24
|\ \
| * | Migrate merged_branch_names to GitalyAhmad Sherif2018-01-111-9/+24
| |/
* | Merge branch 'git-write-ref-prep' into 'master'Robert Speicher2018-01-101-2/+15
|\ \ | |/ |/|
| * Client-prep Gitlab::Git::Repository#write_refgit-write-ref-prepKim "BKC" CarlbÀcker2018-01-091-2/+15
* | Migrate GitlabProject (re)move project endpointsZeger-Jan van de Weg2018-01-091-30/+0
|/
* Merge branch 'remove-commit-tree' into 'master'Sean McGivern2018-01-082-4/+7
|\
| * Remove the Commit#tree methodremove-commit-treeJacob Vosmaer2018-01-042-4/+7
* | Merge branch 'gitaly-fetch-internal-remote' into 'master'Sean McGivern2018-01-081-13/+13
|\ \
| * | Incorporate RemoteService.FetchInternalRemote Gitaly RPCgitaly-fetch-internal-remoteAlejandro RodrĂ­guez2018-01-051-13/+13
* | | Fix error 500 when viewing commit and merge request diffsStan Hu2018-01-071-1/+1
* | | Move git operations for multi_action into Gitlab::GitAlejandro RodrĂ­guez2018-01-052-0/+48
* | | Use --left-right and --max-count for counting diverging commitsLin Jen-Shin (godfat)2018-01-051-7/+68
* | | Merge branch 'zj-blob-batch' into 'master'Douwe Maan2018-01-051-6/+25
|\ \ \
| * | | Fix typos in a code commentZeger-Jan van de Weg2018-01-051-2/+2
| * | | Reroute batch blobs to single blob RPCZeger-Jan van de Weg2018-01-021-6/+25
* | | | Merge branch 'fix/prepare-rebase-to-be-migrated-to-gitaly' into 'master'Sean McGivern2018-01-052-1/+13
|\ \ \ \
| * | | | Prepare Gitlab::Git::Repository#rebase for Gitaly migrationfix/prepare-rebase-to-be-migrated-to-gitalyAhmad Sherif2018-01-042-1/+13
| | |_|/ | |/| |
* | | | Merge branch 'ce-gitaly-remote-mirror-prep' into 'master'Dmitriy Zaporozhets2018-01-042-1/+105
|\ \ \ \ | |/ / / |/| | |
| * | | Move git operations for UpdateRemoteMirrorService into Gitlab::Gitce-gitaly-remote-mirror-prepAlejandro RodrĂ­guez2018-01-031-0/+75
| * | | Move delete_remote_branches from Gitlab::Shell to Gitlab::Git::RepositoryAlejandro RodrĂ­guez2018-01-031-0/+12
| * | | Move push_remote_branches from Gitlab::Shell to Gitlab::Git::RepositoryAlejandro RodrĂ­guez2018-01-031-1/+18
| | |/ | |/|
* | | 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 'sh-optimize-commit-stats' into 'master'Robert Speicher2018-01-031-7/+2
|\ \ \
| * | | Speed up generation of commit stats by using Rugged native methodssh-optimize-commit-statsStan Hu2018-01-021-7/+2
| | |/ | |/|
* | | Merge branch 'migrate-fork-repo-to-gitaly' into 'master'Robert Speicher2018-01-031-15/+51
|\ \ \
| * | | Migrate repo forking to Gitalymigrate-fork-repo-to-gitalyAhmad Sherif2018-01-021-15/+51
| | |/ | |/|
* | | Merge branch 'gitaly-conflict-resolver' into 'master'Grzegorz Bizon2018-01-034-28/+77
|\ \ \ | |_|/ |/| |
| * | Simplify conflict resolution interface and codegitaly-conflict-resolverAlejandro RodrĂ­guez2018-01-023-8/+25
| * | Incorporate ConflictsService.ResolveConflicts Gitaly RPCAlejandro RodrĂ­guez2017-12-272-24/+38
| * | Incorporate ConflictsService.ListConflictFiles Gitaly RPCAlejandro RodrĂ­guez2017-12-272-5/+23
| |/
* | Merge branch 'gitaly-opt-out' into 'master'Stan Hu2017-12-281-2/+2
|\ \
| * | Unmark Gitaly features as OPT_OUT until the gRPC proxy issue is fixedAlejandro RodrĂ­guez2017-12-281-2/+2
| |/
* | Fix feature flags for Gitaly's RemoteService RPCsAlejandro RodrĂ­guez2017-12-271-2/+2
|/
* Merge branch 'gitaly-remotes' into 'master'Dmitriy Zaporozhets2017-12-251-21/+40
|\
| * Incorporate Gitaly's RemoteService RPCsgitaly-remotesAlejandro RodrĂ­guez2017-12-221-16/+40
| * Remove unused method `remote_exists?`Alejandro RodrĂ­guez2017-12-221-5/+0
* | Use gitlab-stylesRĂ©my Coutable2017-12-221-5/+6
|/
* Revert "Merge branch 'repo-write-ref-client-prep' into 'master'"revert-b655a4a7Kim CarlbÀcker2017-12-201-8/+3
* Load commit in batches for pipelines#indexZeger-Jan van de Weg2017-12-191-0/+13
* Merge branch 'no-ivar-in-modules' into 'master'Robert Speicher2017-12-151-6/+6
|\
| * Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-12-1515-260/+554
| |\
| * \ Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-11-303-37/+79
| |\ \
| * \ \ Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-11-224-14/+69
| |\ \ \