summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Clean up cmd_exec execution environmentzj-cleanup-execZeger-Jan van de Weg2018-08-204-196/+41
* Remove non Gitaly code pathsZeger-Jan van de Weg2018-08-202-39/+23
* Merge branch 'zj-remove-repo-path' into 'master'Nick Thomas2018-08-174-43/+7
|\
| * Remove repo_path from GitlabShellzj-remove-repo-pathZeger-Jan van de Weg2018-08-164-43/+7
|/
* Merge branch 'rs-rspec' into 'master'Nick Thomas2018-08-1619-319/+303
|\
| * Disable WEBrick logging in HTTPUNIXServer to reduce spec output noisers-rspecRobert Speicher2018-08-151-0/+6
| * Fix a RuboCop warningRobert Speicher2018-08-151-1/+1
| * Update webmock to 3.4.2Robert Speicher2018-08-154-7/+10
| * Reorganize spec_helper; add support files for VCR and HTTPUNIXServerRobert Speicher2018-08-153-35/+40
| * Use `output` matcher in one testRobert Speicher2018-08-151-4/+1
| * Require gitlab_init from spec_helperRobert Speicher2018-08-151-0/+2
| * Use secure RubyGems sourceRobert Speicher2018-08-152-2/+2
| * Override `ROOT_PATH` in specs in a less insane wayRobert Speicher2018-08-152-3/+7
| * Remove usages of `its` in specsRobert Speicher2018-08-153-16/+27
| * Update rspec to 3.8.0; remove rspec-itsRobert Speicher2018-08-153-17/+15
| * Autocorrect specs via `transpec -k its -v stub_with_hash`Robert Speicher2018-08-1510-195/+195
| * Remove guard and guard-rspecRobert Speicher2018-08-153-42/+0
| * Update VCR to 4.0.0Robert Speicher2018-08-152-3/+3
|/
* Merge branch '148-merge-8-1-1-to-master' into 'master'Robert Speicher2018-08-156-3/+176
|\
| * Merge remote-tracking branch 'upstream/8-1-stable' into 148-merge-8-1-1-to-ma...Nick Thomas2018-08-146-3/+176
| |\ |/ /
| * Release v8.1.1v8.1.18-1-stableNick Thomas2018-08-092-1/+4
| * Merge branch 'fix-ssh-certificate-regressions-8-1' into '8-1-stable'Stan Hu2018-08-094-2/+172
| |\
| | * Guard discovery by username or key against bad API responsesNick Thomas2018-08-091-1/+1
| | * Harden gitlab-shell against arguments following the gl_id parameter in the co...Nick Thomas2018-08-092-4/+4
| | * Fix two regressions in SSH certificate supportÆvar Arnfjörð Bjarmason2018-08-084-2/+172
| |/
* | Merge branch 'revert-refactor' into 'master'Robert Speicher2018-08-1466-2084/+1177
|\ \
| * | Restore "Pass custom git_config_options to Gitalyo"Nick Thomas2018-08-1412-275/+473
| * | Revert "Merge branch 'ash.mckenzie/srp-refactor' into 'master'"Nick Thomas2018-08-1466-2077/+1164
| * | Revert "Pass custom git_config_options to Gitalyo"Nick Thomas2018-08-1411-468/+276
|/ /
* | Merge branch 'sh-add-require-create-hooks' into 'master'Rémy Coutable2018-08-091-0/+1
|\ \
| * | Add missing require statement in create-hooksStan Hu2018-08-091-0/+1
|/ /
* | Merge branch 'rd-support-git-config-options' into 'master'Robert Speicher2018-08-0811-276/+468
|\ \
| * | Pass custom git_config_options to GitalyoRubén Dávila2018-08-0711-276/+468
* | | Merge branch 'ash.mckenzie/srp-refactor' into 'master'Robert Speicher2018-08-0866-1164/+2077
|\ \ \ | |_|/ |/| |
| * | Typo fixAsh McKenzie2018-08-081-1/+1
| |/
| * Actor::Base audit_usernames? now an aliasAsh McKenzie2018-08-031-4/+2
| * Merge remote-tracking branch 'origin/master' into ash.mckenzie/srp-refactorAsh McKenzie2018-08-0210-13/+34
| |\ | |/ |/|
* | Merge branch 'release-gitlab-8-1' into 'master'v8.1.0Nick Thomas2018-08-012-2/+4
|\ \
| * | Release v8.1.0Nick Thomas2018-08-012-2/+4
|/ /
* | Merge branch 'add-protocol-v2-logic' into 'master'Nick Thomas2018-08-016-39/+61
|\ \
| * | use GIT_PROTOCOL env variable in gitlab_shell#execJames Lopez2018-08-012-2/+6
| * | update gitlab shell to remove git_protocol env varJames Lopez2018-08-012-2/+0
| * | Add Git protocol v2James Lopez2018-08-016-40/+60
|/ /
| * Added TODO to fixup whatever namingAsh McKenzie2018-08-011-0/+2
| * Fixed comments in bin/gitlab-shell-authorized*Ash McKenzie2018-08-012-4/+4
| * GitlatNet#discover only parse JSON if a 200Ash McKenzie2018-08-013-2/+54
| * Update Actor::Username, add specsAsh McKenzie2018-08-014-5/+96
| * Actor::Base#label now describes the class nicelyAsh McKenzie2018-08-011-1/+5
| * Merge remote-tracking branch 'origin/master' into ash.mckenzie/srp-refactorAsh McKenzie2018-08-0119-103/+211
| |\ | |/ |/|
* | Merge branch 'release-version-8' into 'master'v8.0.0Nick Thomas2018-07-312-1/+4
|\ \
View Lorry Controller Status