summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'feature/migrate-repo-restorer-to-gitaly' into 'master'Robert Speicher2018-01-254-6/+39
|\
| * Migrate restoring repo from bundle to Gitalyfeature/migrate-repo-restorer-to-gitalyAhmad Sherif2018-01-244-6/+39
* | Merge branch 'lint-rugged' into 'master'Rémy Coutable2018-01-255-10/+21
|\ \
| * | Look for rugged with static analysislint-ruggedJacob Vosmaer2018-01-255-10/+21
* | | 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-252-3/+3
|\ \ \ \
| * | | | Fix .batch_lfs_pointers accepting a lazy enumeratorfix/batch-lfs-pointers-accepting-lazy-enumAhmad Sherif2018-01-252-3/+3
| |/ / /
* | | | Make Gitaly RepositoryExists opt-outJacob Vosmaer (GitLab)2018-01-251-1/+1
| |/ / |/| |
* | | Merge branch 'revert-9f5390d8' into 'master'Marin Jankovski2018-01-251-10/+1
|\ \ \
| * | | Revert "Merge branch 'osw-updates-merge-status-on-api-actions' into 'master'"Douwe Maan2018-01-251-10/+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 '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-243-3/+90
* | | | 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
| | |_|/ | |/| |
* | | | Merge branch 'search-100' into 'master'Yorick Peterse2018-01-244-21/+51
|\ \ \ \
| * | | | Use limit for search count queriessearch-100Jan Provaznik2018-01-234-21/+51
* | | | | Migrate .batch_lfs_pointers to Gitalyfeature/migrate-get-lfs-ptrs-to-gitalyAhmad Sherif2018-01-243-7/+39
| |/ / / |/| | |
* | | | Merge branch 'feature/migrate-bundle-to-disk-to-gitaly' into 'master'Robert Speicher2018-01-245-6/+31
|\ \ \ \
| * | | | Migrate repository bundling to Gitalyfeature/migrate-bundle-to-disk-to-gitalyAhmad Sherif2018-01-245-6/+31
* | | | | Merge branch 'osw-updates-merge-status-on-api-actions' into 'master'Douwe Maan2018-01-241-1/+10
|\ \ \ \ \
| * | | | | Return more consistent values for merge_status on MR APIOswaldo Ferreira2018-01-231-1/+10
* | | | | | Merge branch 'PNSalocin/gitlab-ce-24035-api-create-application' into 'master'Rémy Coutable2018-01-243-0/+38
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Make the exposing of the Application secret more explicitPNSalocin/gitlab-ce-24035-api-create-applicationToon Claes2018-01-242-3/+7
| * | | | | Add documentation about when the application API was addedToon Claes2018-01-241-0/+1
| * | | | | Add application create APINicolas MERELLI2018-01-243-0/+33
| | |/ / / | |/| | |
* | | | | 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 'dm-push-rule-regexp-error-ce' into 'master'Douwe Maan2018-01-231-17/+21
|\ \ \ \
| * | | | Backport changes to Gitlab::Checks::ChangeAccess from EEDouwe Maan2018-01-231-17/+21
* | | | | Merge branch 'gitaly-update-remote-mirror' into 'master'Rémy Coutable2018-01-232-5/+46
|\ \ \ \ \
| * | | | | Incorporate Gitaly's RemoteService.UpdateRemoteMirror RPCgitaly-update-remote-mirrorAlejandro Rodríguez2018-01-222-5/+46
* | | | | | Merge branch 'gitaly-user-commit-files' into 'master'Douwe Maan2018-01-232-25/+113
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Incorporate Gitaly's OperationService.UserCommitFiles RPCgitaly-user-commit-filesAlejandro Rodríguez2018-01-222-25/+113
* | | | | | Merge branch 'fix-postgresql-table-grant' into 'master'Stan Hu2018-01-221-20/+30
|\ \ \ \ \ \
| * | | | | | Use has_table_privilege for TRIGGER on PostgreSQLfix-postgresql-table-grantYorick Peterse2018-01-221-20/+30
* | | | | | | Merge branch 'add-profiler-to-application' into 'master'Stan Hu2018-01-221-0/+142
|\ \ \ \ \ \ \
| * | | | | | | Add Gitlab::Profiler for profiling from a console or runnerSean McGivern2018-01-191-0/+142
* | | | | | | | 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
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Default to Gitaly for 'git push' HTTP/SSH, and make Gitaly mandatory for SSH ...Jacob Vosmaer (GitLab)2018-01-222-8/+12
* | | | | | | | Merge branch 'gitaly-write-ref-error-handling' into 'master'Robert Speicher2018-01-221-13/+19
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | 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 '41673-blank-query-members-api' into 'master'Rémy Coutable2018-01-222-2/+2
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Fix error on empty query for Members APIMark Fletcher2018-01-212-2/+2
View Lorry Controller Status