summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Migrate repository bundling to Gitalyfeature/migrate-bundle-to-disk-to-gitalyAhmad Sherif2018-01-245-6/+31
* 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
* | | | | | | Merge branch 'patch-19' into 'master'Rémy Coutable2018-01-221-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | typo fixBen Bodenmiller2018-01-181-1/+1
* | | | | | | Merge branch 'gitaly-write-repo-config-prep' into 'master'Douwe Maan2018-01-221-0/+4
|\ \ \ \ \ \ \
| * | | | | | | _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 Git::Repository#writ...Kim "BKC" Carlbäcker2018-01-191-0/+4
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch '42231-protected-branches-api-route-returns-404-for-branches-wit...Rémy Coutable2018-01-221-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Fix protected branches API to accept name parameter with dotMark Fletcher2018-01-191-1/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'fix-redirect-routes-schema' into 'master'Yorick Peterse2018-01-191-0/+2
|\ \ \ \ \ \
| * | | | | | Rework indexes on redirect_routes to be more effective and enforce a case ins...fix-redirect-routes-schemaGreg Stark2018-01-181-0/+2
* | | | | | | Merge branch 'fix-derefenced-target' into 'master'Douwe Maan2018-01-191-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Fix dereferenced_target naming in Gitlab::Git::Ref initializeSerdar Dogruyol2018-01-171-2/+2
* | | | | | | | Merge branch '42159-utf8-uploads' into 'master'Douwe Maan2018-01-191-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Correctly escape UTF-8 path elements for uploadsNick Thomas2018-01-181-3/+3
* | | | | | | | | Resolve "Projects API: filter 'with_issues_enabled=true' returns projects wit...Jan Christophersen2018-01-191-2/+2
| |_|_|_|/ / / / |/| | | | | | |
* | | | | | | | Merge branch 'background-migration-fix' into 'master'Douwe Maan2018-01-182-2/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Reduce UPDATEs for background column type changesbackground-migration-fixYorick Peterse2018-01-182-2/+5
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'gitaly-commit-signature' into 'master'Sean McGivern2018-01-183-6/+37
|\ \ \ \ \ \ \
| * | | | | | | Retrieve commit signatures with GitalyJacob Vosmaer (GitLab)2018-01-183-6/+37
| |/ / / / / /
* | | | | | | Remove Rugged::Walker from Repository#logJacob Vosmaer (GitLab)2018-01-181-26/+1
|/ / / / / /
* | | | | | Merge branch 'feature/merge-request-system-hook' into 'master'Douwe Maan2018-01-182-2/+3
|\ \ \ \ \ \
| * | | | | | api support for merge_requests_events system hookAlexis Reigel2018-01-042-2/+3
* | | | | | | Merge branch '42129-fix-project-snippet-user-agent-detail' into 'master'Sean McGivern2018-01-181-1/+1
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Fix the user-agent detail API endpoint for project snippetsNick Thomas2018-01-171-1/+1
* | | | | | | Merge branch 'sh-backport-10-3-4-security-fixes' into 'master'Oswaldo Ferreira2018-01-1714-53/+140
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Make ruby lint happysh-backport-10-3-4-security-fixesOswaldo Ferreira2018-01-171-0/+1
| * | | | | | Merge branch 'jej/fix-disabled-oauth-access-10-3' into 'security-10-3'Robert Speicher2018-01-162-5/+12
| * | | | | | Merge branch 'fix/import-rce-10-3' into 'security-10-3'James Lopez2018-01-163-3/+19
| * | | | | | Merge branch '41293-fix-command-injection-vulnerability-on-system_hook_push-q...Robert Speicher2018-01-161-0/+4
| * | | | | | Merge branch 'sh-migrate-can-push-to-deploy-keys-projects-10-3' into 'securit...Douwe Maan2018-01-163-33/+84
| * | | | | | Merge branch 'ac/fix-path-traversal' into 'security-10-3'Robert Speicher2018-01-161-1/+15
View Lorry Controller Status