summaryrefslogtreecommitdiff
path: root/lib/gitlab/git
Commit message (Expand)AuthorAgeFilesLines
* 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 '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
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-11-174-37/+141
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-11-0627-174/+1330
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-09-2512-35/+206
| |\ \ \ \ \ \
| * | | | | | | Add cop to make sure we don't use ivar in a moduleLin Jen-Shin2017-09-181-6/+6
* | | | | | | | Merge branch 'gitaly-conflicts-prep' into 'master'Sean McGivern2017-12-151-30/+29
|\ \ \ \ \ \ \ \
| * | | | | | | | Simplify conflict resolver interfacegitaly-conflicts-prepAlejandro Rodríguez2017-12-141-30/+29
* | | | | | | | | Merge branch '41016-import-gitlab-shell-projects' into 'master'Douwe Maan2017-12-152-4/+283
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Import gitlab_projects.rb from gitlab-shellNick Thomas2017-12-142-4/+283
| |/ / / / / / /
* | | | | | | | Merge branch 'feature/migrate-merge-base-to-gitaly' into 'master'Robert Speicher2017-12-142-2/+9
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Migrate Gitlab::Git::Repository#merge_base_commit to Gitalyfeature/migrate-merge-base-to-gitalyAhmad Sherif2017-12-132-2/+9
* | | | | | | | Merge branch 'repo-write-ref-client-prep' into 'master'Robert Speicher2017-12-121-3/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | Move Repository#write_ref to Git::Repository#write_refrepo-write-ref-client-prepKim "BKC" Carlbäcker2017-12-121-3/+8
| |/ / / / / / /
* | | | | | | | Merge branch 'gitaly-mirroring-prep' into 'master'Robert Speicher2017-12-112-35/+42
|\ \ \ \ \ \ \ \
| * | | | | | | | Unify mirror addition operations to prepare for Gitaly migrationgitaly-mirroring-prepAlejandro Rodríguez2017-12-062-17/+19
| * | | | | | | | Add feature flag to use gitaly-ssh mirroring when cloning internal reposAlejandro Rodríguez2017-12-062-20/+25
* | | | | | | | | Keep track of storage check timingsBob Van Landuyt2017-12-111-1/+23
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Move the circuitbreaker check out in a separate processbvl-circuitbreaker-processBob Van Landuyt2017-12-085-117/+160
* | | | | | | | Migrate Git::Repository#fsck to GitalyKim Carlbäcker2017-12-081-2/+16
* | | | | | | | Merge branch 'dm-commit-diff-discussions-in-mr-context' into 'master'Douwe Maan2017-12-071-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | add support for the commit reference filtermicael.bergeron2017-12-071-0/+1
| |/ / / / / / /
* | | | | | | | Remove Rugged::Repository#empty?Zeger-Jan van de Weg2017-12-073-25/+15
|/ / / / / / /
* | | | | | | Merge branch 'feature/migrate-revert-to-gitaly' into 'master'Robert Speicher2017-12-051-17/+36
|\ \ \ \ \ \ \
| * | | | | | | Migrate Gitlab::Git::Repository#revert to Gitalyfeature/migrate-revert-to-gitalyAhmad Sherif2017-12-051-17/+36
* | | | | | | | Migrate Gitlab::Git::Commit.shas_with_signaturesgitaly-764-commit-filter-shas-with-signatureKim "BKC" Carlbäcker2017-12-051-5/+11
|/ / / / / / /
* | | | | | | Merge branch 'gitaly-conflict-file' into 'master'Sean McGivern2017-12-052-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Use `String#end_with?` instead of `String#ends_with?`gitaly-conflict-fileAlejandro Rodríguez2017-12-041-1/+1
View Lorry Controller Status