summaryrefslogtreecommitdiff
path: root/lib/gitlab/git
Commit message (Expand)AuthorAgeFilesLines
* Allow moving wiki pages from the UIFrancisco Javier López2018-02-051-5/+19
* Merge branch 'gitaly-user-squash' into 'master'Rémy Coutable2018-02-051-26/+37
|\
| * Incorporate OperationService.UserSquash Gitaly RPCgitaly-user-squashAlejandro Rodríguez2018-02-021-26/+37
* | Merge branch 'zj-ref-contains' into 'master'Douwe Maan2018-02-043-16/+30
|\ \ | |/ |/|
| * Merge branch 'master' into 'zj-ref-contains'zj-ref-containsDouwe Maan2018-02-011-1/+13
| |\
| * | Remove intermediate methods on Branch and Tag classesZeger-Jan van de Weg2018-02-013-19/+7
| * | Client changes for Tag,BranchNamesContainingCommitZeger-Jan van de Weg2018-02-013-21/+47
* | | Fix an issue where sparse checkout wasn't configured correctly42223-squashing-mrs-takes-too-longAlejandro Rodríguez2018-02-011-1/+1
| |/ |/|
* | Merge branch 'gitaly-970-repo-write-config' into 'master'Robert Speicher2018-02-011-1/+13
|\ \ | |/ |/|
| * Migrate Gitlab::Git::Repository#write_config to Gitalygitaly-970-repo-write-configKim "BKC" Carlbäcker2018-01-311-1/+13
* | Merge branch '42497-rubocop-style-regexpliteral' into 'master'Rémy Coutable2018-02-015-7/+7
|\ \
| * | Enable RuboCop Style/RegexpLiteralTakuya Noguchi2018-02-015-7/+7
| |/
* | Merge branch 'repository-log-disable-walk' into 'master'Douwe Maan2018-01-311-24/+1
|\ \
| * | Remove Rugged::Walk implementation of #logrepository-log-disable-walkJacob Vosmaer2018-01-311-24/+1
* | | Merge branch 'rugged-reference-cache-rescue' into 'master'Sean McGivern2018-01-311-0/+2
|\ \ \ | |_|/ |/| |
| * | Remove Rugged exception in cache rescuerugged-reference-cache-rescueJacob Vosmaer2018-01-301-0/+2
* | | Merge branch 'fix/move-can-be-merged-to-lib-git' into 'master'Grzegorz Bizon2018-01-311-0/+18
|\ \ \ | |_|/ |/| |
| * | Move Repository#can_be_merged? to Gitlab::Git::Repositoryfix/move-can-be-merged-to-lib-gitAhmad Sherif2018-01-301-0/+18
* | | Migrate Git::Repository#delete_refs to Gitalyfeature/migrate-delete-refs-to-gitalyAhmad Sherif2018-01-301-10/+24
* | | Merge branch 'feature/migrate-wiki-page-formatted-data-to-gitaly' into 'master'Robert Speicher2018-01-301-0/+14
|\ \ \
| * | | Migrate fetching wiki page formatted content to Gitalyfeature/migrate-wiki-page-formatted-data-to-gitalyAhmad Sherif2018-01-301-0/+14
* | | | Merge branch 'gitaly-784-repo-write-ref' into 'master'Douwe Maan2018-01-301-4/+16
|\ \ \ \ | |_|_|/ |/| | |
| * | | Migrate Git::Repository#write_ref to Gitalygitaly-784-repo-write-refKim "BKC" Carlbäcker2018-01-301-4/+16
| | |/ | |/|
* | | Decouple more of Repository from RuggedJacob Vosmaer (GitLab)2018-01-303-20/+76
|/ /
* | Don't allow Repository#log with limit zeroJacob Vosmaer (GitLab)2018-01-291-1/+5
* | Set alternate object directories in run_gitJacob Vosmaer (GitLab)2018-01-293-23/+35
|/
* Merge branch 'feature/migrate-repo-restorer-to-gitaly' into 'master'Robert Speicher2018-01-251-0/+13
|\
| * Migrate restoring repo from bundle to Gitalyfeature/migrate-repo-restorer-to-gitalyAhmad Sherif2018-01-241-0/+13
* | Merge branch 'lint-rugged' into 'master'Rémy Coutable2018-01-251-0/+2
|\ \
| * | Look for rugged with static analysislint-ruggedJacob Vosmaer2018-01-251-0/+2
* | | Merge branch 'contrain-run-git' into 'master'Rémy Coutable2018-01-251-17/+82
|\ \ \
| * | | Make Gitlab::Git::Repository#run_git privatecontrain-run-gitJacob Vosmaer2018-01-251-17/+82
* | | | Merge branch 'fix/batch-lfs-pointers-accepting-lazy-enum' into 'master'Grzegorz Bizon2018-01-251-3/+1
|\ \ \ \
| * | | | Fix .batch_lfs_pointers accepting a lazy enumeratorfix/batch-lfs-pointers-accepting-lazy-enumAhmad Sherif2018-01-251-3/+1
| |/ / /
* | | | Make Gitaly RepositoryExists opt-outJacob Vosmaer (GitLab)2018-01-251-1/+1
| |/ / |/| |
* | | Merge branch 'revert-430b3f0e' into 'master'Douwe Maan2018-01-251-1/+26
|\ \ \
| * | | Revert "Merge branch 'remove-rugged-walk' into 'master'"revert-430b3f0eJacob Vosmaer (GitLab)2018-01-251-1/+26
| |/ /
* | | Merge branch 'jej/gitattributes-check-at-ref' into 'master'Rémy Coutable2018-01-254-38/+92
|\ \ \ | |/ / |/| |
| * | Can parse root .gitattributes file for a refjej/gitattributes-check-at-refJames Edwards-Jones2018-01-244-38/+92
* | | Merge branch 'fix/add-formatted-data-to-wiki-page' into 'master'Robert Speicher2018-01-241-1/+2
|\ \ \
| * | | Add formatted_data attribute to Git::WikiPageAhmad Sherif2018-01-241-1/+2
| | |/ | |/|
* | | Migrate .batch_lfs_pointers to Gitalyfeature/migrate-get-lfs-ptrs-to-gitalyAhmad Sherif2018-01-242-7/+19
|/ /
* | Migrate repository bundling to Gitalyfeature/migrate-bundle-to-disk-to-gitalyAhmad Sherif2018-01-241-0/+12
* | Merge branch 'gitaly-update-remote-mirror' into 'master'Rémy Coutable2018-01-231-5/+19
|\ \
| * | 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 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 avatarsh-fix-error-500-no-avatarsStan Hu2018-01-201-0/+4
| | |/ / | |/| |
* | | | Merge branch 'gitaly-write-ref-error-handling' into 'master'Robert Speicher2018-01-221-13/+19
|\ \ \ \