summaryrefslogtreecommitdiff
path: root/lib/gitlab/git
Commit message (Collapse)AuthorAgeFilesLines
* Fix .batch_lfs_pointers accepting a lazy enumeratorfix/batch-lfs-pointers-accepting-lazy-enumAhmad Sherif2018-01-251-3/+1
|
* Merge branch 'fix/add-formatted-data-to-wiki-page' into 'master'Robert Speicher2018-01-241-1/+2
|\ | | | | | | | | | | | | Add formatted_data attribute to Git::WikiPage Closes #39805 See merge request gitlab-org/gitlab-ce!16682
| * Add formatted_data attribute to Git::WikiPageAhmad Sherif2018-01-241-1/+2
| | | | | | | | Related to #39805
* | Migrate .batch_lfs_pointers to Gitalyfeature/migrate-get-lfs-ptrs-to-gitalyAhmad Sherif2018-01-242-7/+19
|/ | | | Closes gitaly#921
* Migrate repository bundling to Gitalyfeature/migrate-bundle-to-disk-to-gitalyAhmad Sherif2018-01-241-0/+12
| | | | Closes gitaly#929
* Merge branch 'gitaly-update-remote-mirror' into 'master'Rémy Coutable2018-01-231-5/+19
|\ | | | | | | | | | | | | Incorporate Gitaly's RemoteService.UpdateRemoteMirror RPC Closes gitaly#936 See merge request gitlab-org/gitlab-ce!16536
| * Incorporate Gitaly's RemoteService.UpdateRemoteMirror RPCgitaly-update-remote-mirrorAlejandro Rodríguez2018-01-221-5/+19
| |
* | Merge branch 'gitaly-user-commit-files' into 'master'Douwe Maan2018-01-231-25/+41
|\ \ | | | | | | | | | | | | | | | | | | Incorporate Gitaly's OperationService.UserCommitFiles RPC Closes gitaly#890 See merge request gitlab-org/gitlab-ce!16307
| * | Incorporate Gitaly's OperationService.UserCommitFiles RPCgitaly-user-commit-filesAlejandro Rodríguez2018-01-221-25/+41
| | |
* | | Merge branch 'sh-fix-error-500-no-avatars' into 'master'Robert Speicher2018-01-221-0/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix Error 500 when repository has no avatar Closes #42249 See merge request gitlab-org/gitlab-ce!16601
| * | | Fix Error 500 when repository has no avatarsh-fix-error-500-no-avatarsStan Hu2018-01-201-0/+4
| | |/ | |/| | | | | | | Closes #42249
* | | Merge branch 'gitaly-write-ref-error-handling' into 'master'Robert Speicher2018-01-221-13/+19
|\ \ \ | | | | | | | | | | | | | | | | Wrap Rugged-exceptions in Gitlab::Git::Repository#write_ref See merge request gitlab-org/gitlab-ce!16570
| * | | Move error-handling to lib/gitlab/gitKim "BKC" Carlbäcker2018-01-221-2/+4
| | | |
| * | | Wrap Rugged-exceptions in Gitlab::Git::Repository#write_refgitaly-write-ref-error-handlingKim "BKC" Carlbäcker2018-01-181-13/+17
| | | |
* | | | Merge branch 'gitaly-write-repo-config-prep' into 'master'Douwe Maan2018-01-221-0/+4
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Move rugged-call from Project#write_repository_config to Git::Repository#write_config See merge request gitlab-org/gitlab-ce!16572
| * | | _never_ unset gitlab.full_pathgitaly-write-repo-config-prepKim "BKC" Carlbäcker2018-01-191-2/+2
| | | |
| * | | Move rugged-call from Project#write_repository_config to ↵Kim "BKC" Carlbäcker2018-01-191-0/+4
| | |/ | |/| | | | | | | Git::Repository#write_config
* | | Merge branch 'fix-derefenced-target' into 'master'Douwe Maan2018-01-191-2/+2
|\ \ \ | |/ / |/| | | | | | | | Fix dereferenced_target naming in Gitlab::Git::Ref initialize See merge request gitlab-org/gitlab-ce!16504
| * | Fix dereferenced_target naming in Gitlab::Git::Ref initializeSerdar Dogruyol2018-01-171-2/+2
| | |
* | | Merge branch 'gitaly-commit-signature' into 'master'Sean McGivern2018-01-181-0/+18
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Retrieve commit signatures with Gitaly Closes gitaly#923 See merge request gitlab-org/gitlab-ce!16467
| * | | Retrieve commit signatures with GitalyJacob Vosmaer (GitLab)2018-01-181-0/+18
| | | |
* | | | Remove Rugged::Walker from Repository#logJacob Vosmaer (GitLab)2018-01-181-26/+1
|/ / /
* | | Remove unused methods from Gitlab::GitJacob Vosmaer (GitLab)2018-01-171-31/+0
| |/ |/|
* | Merge branch 'jej/lfs-rev-list-handles-non-utf-paths-41627' into 'master'Stan Hu2018-01-161-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Prevent RevList failing on non utf8 paths Closes #41627 See merge request gitlab-org/gitlab-ce!16440
| * | Prevent RevList failing on non utf8 pathsjej/lfs-rev-list-handles-non-utf-paths-41627James Edwards-Jones2018-01-161-1/+1
| | |
* | | Merge branch 'feature/migrate-commit-uri-to-gitaly' into 'master'Sean McGivern2018-01-161-5/+32
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Migrate Commit#uri_type to Gitaly Closes gitaly#915 See merge request gitlab-org/gitlab-ce!16453
| * | | Migrate Commit#uri_type to Gitalyfeature/migrate-commit-uri-to-gitalyAhmad Sherif2018-01-151-5/+32
| |/ / | | | | | | | | | Closes gitaly#915
* | | Migrate importing repository to Gitalyfeature/migrate-import-repository-to-gitalyAhmad Sherif2018-01-151-22/+42
| | | | | | | | | | | | Closes gitaly#907
* | | Merge branch 'feature/migrate-can-be-merged-to-gitaly' into 'master'Grzegorz Bizon2018-01-151-1/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Migrate Repository#can_be_merged? to Gitaly Closes gitaly#893 See merge request gitlab-org/gitlab-ce!16316
| * | Migrate Repository#can_be_merged? to Gitalyfeature/migrate-can-be-merged-to-gitalyAhmad Sherif2018-01-111-1/+1
| | |
* | | Merge branch 'feature/migrate-is-rebase-in-progress-to-gitaly' into 'master'Robert Speicher2018-01-111-1/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Migrate rebase_in_progress? to Gitaly Closes gitaly#866 See merge request gitlab-org/gitlab-ce!16286
| * | | Migrate rebase_in_progress? to Gitalyfeature/migrate-is-rebase-in-progress-to-gitalyAhmad Sherif2018-01-101-1/+7
| | | | | | | | | | | | | | | | Closes gitaly#866
* | | | Merge branch 'feature/migrate-rebase-to-gitaly' into 'master'Robert Speicher2018-01-111-22/+48
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate Gitlab::Git::Repository#rebase to Gitaly Closes gitaly#863 See merge request gitlab-org/gitlab-ce!16259
| * | | | Migrate Gitlab::Git::Repository#rebase to Gitalyfeature/migrate-rebase-to-gitalyAhmad Sherif2018-01-101-22/+48
| |/ / / | | | | | | | | | | | | Closes gitaly#863
* | | | 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 Gitaly Closes gitaly#851 See merge request gitlab-org/gitlab-ce!16157
| * | | | Migrate merged_branch_names to GitalyAhmad Sherif2018-01-111-9/+24
| |/ / / | | | | | | | | | | | | Closes gitaly#851
* | | | Merge branch 'git-write-ref-prep' into 'master'Robert Speicher2018-01-101-2/+15
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Gitlab::Git::Repository#write_ref client-prep take 2 Closes gitaly#793 See merge request gitlab-org/gitlab-ce!16287
| * | | 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
|/ / | | | | | | | | | | | | | | | | Migration is done through a small refactoring, which makes us call endpoins which are performing the same actions for namespaces. Tests are added to ensure only the project is removed that should be removed. Closes gitlab-org/gitaly#873
* | Merge branch 'remove-commit-tree' into 'master'Sean McGivern2018-01-082-4/+7
|\ \ | | | | | | | | | | | | Remove the Commit#tree method See merge request gitlab-org/gitlab-ce!16236
| * | 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 RPC Closes gitaly#857 See merge request gitlab-org/gitlab-ce!16140
| * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to the refactoring in !16082, `Blob#batch` no longer falls back to a default `blob_size_limit`. Since `Repository#batch_blobs` was using a default `nil` value, this would cause issues in the `Blob#find_by_rugged` method. This fix here is to be consistent and use a non-nil default value in `Repository#batch_blobs`. The problem was masked in development and tests because Gitaly is always enabled by default for all features. Closes #41735
* | | | 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
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Reroute batch blobs to single blob RPC See merge request gitlab-org/gitlab-ce!16082
| * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Given the priorities shifted for the Gitaly team, this endpoint does not get a dedicated endpoint yet. To make it work in a cloud native environment the request needs to go to Gitaly, not rugged. This is achieved by rerouting to the generic TreeEntry endpoint.
View Lorry Controller Status