summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Set client name when making requests to Gitalycl-client-nameChangzheng Liu2020-05-213-13/+320
|
* Merge branch 'sh-fix-logrus-race' into 'master'Nick Thomas2020-05-134-0/+25
|\ | | | | | | | | | | | | Fix race conditions with logrus testing Closes #450 See merge request gitlab-org/gitlab-shell!385
| * Fix race conditions with logrus testingsh-fix-logrus-raceStan Hu2020-05-114-0/+25
| | | | | | | | | | | | | | | | | | logrus fires a Goroutine to write logs, so the tests could fail if they checked the event queue before the logrus have fired. Since there isn't an easy way to flush all outstanding hooks, we just retry every 100 ms for up to a second for log to arrive in the queue. Closes https://gitlab.com/gitlab-org/gitlab-shell/-/issues/450
* | Merge branch 'sh-add-race-test' into 'master'Igor Drozdov2020-05-122-0/+9
|\ \ | | | | | | | | | | | | Add race testing as separate CI step See merge request gitlab-org/gitlab-shell!383
| * | Add race testing as separate CI stepsh-add-race-testStan Hu2020-05-112-0/+9
| |/ | | | | | | | | This would help catch race conditions such as https://gitlab.com/gitlab-org/gitlab-shell/-/issues/450 before merge.
* | Merge branch 'sh-release-13.2.0' into 'master'v13.2.0Nick Thomas2020-05-122-1/+4
|\ \ | |/ |/| | | | | Release v13.2.0 See merge request gitlab-org/gitlab-shell!384
| * Release v13.2.0sh-release-13.2.0Stan Hu2020-05-112-1/+4
|/
* Merge branch 'sh-add-http-status-code' into 'master'Igor Drozdov2020-05-115-34/+64
|\ | | | | | | | | | | | | Add HTTP status code to internal API logs Closes #450 See merge request gitlab-org/gitlab-shell!376
| * Fix race conditions in testssh-add-http-status-codeStan Hu2020-05-084-44/+51
| | | | | | | | | | | | | | | | Calling logrus hook.LastEntry() can lead to race conditions. Use AllEntries instead: https://github.com/sirupsen/logrus/blob/60c74ad9be0d874af0ab0daef6ab07c5c5911f0d/hooks/test/test.go#L77 Closes https://gitlab.com/gitlab-org/gitlab-shell/-/issues/450
| * Add HTTP status code to internal API logsStan Hu2020-05-082-12/+35
|/ | | | This would make it easier to filter the logs by status code.
* Merge branch 'release-13-1-0' into 'master'v13.1.0Nick Thomas2020-05-062-1/+4
|\ | | | | | | | | Release v13.1.0 See merge request gitlab-org/gitlab-shell!382
| * Release v13.1.0Nick Thomas2020-05-062-1/+4
|/
* Merge branch 'pass-secret-to-client' into 'master'Nick Thomas2020-05-061-1/+1
|\ | | | | | | | | | | | | Ensure we are passing the parsed secret Closes #458 See merge request gitlab-org/gitlab-shell!381
| * Ensure we are passing the parsed secretDJ Mountney2020-05-061-1/+1
|/ | | | | | | | Rather than the secret file. The parsing of the file was already done in the gitlab-shell config. This fixes an issue where a recent refactor of the gitlabnet client passed the wrong value.
* Merge branch 'gitlab-shell-release-13-0-0' into 'master'v13.0.0Patrick Bajao2020-05-062-1/+4
|\ | | | | | | | | Release v13.0.0 See merge request gitlab-org/gitlab-shell!379
| * Release v13.0.0gitlab-shell-release-13-0-0John Cai2020-05-052-1/+4
|/
* Merge branch ↵Nick Thomas2020-05-051-4/+0
|\ | | | | | | | | | | | | | | | | '457-custom_hooks_dir-setting-in-config-yml-example-is-no-longer-relevant' into 'master' Remove custom_hooks_dir setting Closes #457 See merge request gitlab-org/gitlab-shell!378
| * Remove custom_hooks_dir setting457-custom_hooks_dir-setting-in-config-yml-example-is-no-longer-relevantAsh McKenzie2020-05-051-4/+0
|/ | | | It now lives within gitaly
* Merge branch 'jc-refactor-gitlabnet-client' into 'master'Nick Thomas2020-05-0538-369/+379
|\ | | | | | | | | | | | | Move gitlabnet client to client package Closes #451 See merge request gitlab-org/gitlab-shell!377
| * Move gitlabnet client to client packagejc-refactor-gitlabnet-clientJohn Cai2020-05-0438-369/+379
|/
* Merge branch 'add-default-workflow-and-rules' into 'master'Patrick Bajao2020-04-211-23/+36
|\ | | | | | | | | Set default, workflow, and use rules in CI config See merge request gitlab-org/gitlab-shell!375
| * Set default, workflow, and use rules in CI configadd-default-workflow-and-rulesRémy Coutable2020-04-171-23/+36
|/ | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'gitlab-shell-release-12-2-0' into 'master'v12.2.0Patrick Bajao2020-04-172-1/+4
|\ | | | | | | | | Release v12.2.0 See merge request gitlab-org/gitlab-shell!374
| * Release v12.2.0gitlab-shell-release-12-2-0Ash McKenzie2020-04-172-1/+4
| |
* | Merge branch ↵Patrick Bajao2020-04-1711-27/+502
|\ \ | |/ |/| | | | | | | | | '202037-geo-ssh-clone-pull-redirect-to-primary-when-selective-sync-enabled-and-project-not-selected' into 'master' Geo: Add custom action support for clone/pull See merge request gitlab-org/gitlab-shell!369
| * Geo Pull custom action supportAsh McKenzie2020-04-177-10/+319
| |
| * Rename Geo proxy routes to be accurateAsh McKenzie2020-04-171-3/+3
| |
| * Allow allowedPayloadPath to be providedAsh McKenzie2020-04-171-7/+11
| |
| * Rename Geo Push custom action testAsh McKenzie2020-04-171-1/+1
| |
| * Rename action to be more accurateAsh McKenzie2020-04-171-5/+5
| |
| * Rename allowed payload JSON for accuracyAsh McKenzie2020-04-172-2/+2
| |
| * New pktline packageAsh McKenzie2020-04-172-0/+162
|/ | | | | | | Package is responsible for parsing git pkt lines. Copied from gitaly, for now.
* Merge branch 'id-extract-custom-action-in-separate-module' into 'master'Patrick Bajao2020-04-155-45/+90
|\ | | | | | | | | Extract customaction into a separate module See merge request gitlab-org/gitlab-shell!370
| * Extract customaction into a separate moduleid-extract-custom-action-in-separate-moduleIgor Drozdov2020-04-145-45/+90
|/ | | | We'll reuse this module for uploadpack in the future
* Merge branch 'pb-update-release-steps' into 'master'Igor Drozdov2020-04-131-4/+6
|\ | | | | | | | | Update release steps to be more explicit See merge request gitlab-org/gitlab-shell!373
| * Update release steps to be more explicitpb-update-release-stepsPatrick Bajao2020-04-131-4/+6
|/ | | | | Include information about not requiring a second maintainer review when releasing.
* Merge branch 'release-12-1-0' into 'master'v12.1.0Nick Thomas2020-04-082-1/+5
|\ | | | | | | | | Release v12.1.0 See merge request gitlab-org/gitlab-shell!372
| * Release v12.1.0release-12-1-0Patrick Bajao2020-04-082-1/+5
|/
* Merge branch 'sh-log-git-upload-receive-pack' into 'master'Patrick Bajao2020-04-087-0/+50
|\ | | | | | | | | Log git-{upload-pack,receive-pack} requests See merge request gitlab-org/gitlab-shell!367
| * Add missed protocol againsh-log-git-upload-receive-packDavid Kim2020-04-081-1/+1
| |
| * Remove unnecessary command argumentDavid Kim2020-04-084-5/+5
| |
| * Move logging to handler insteadDavid Kim2020-04-075-29/+23
| |
| * Change git command logging keys to be be snake casedDavid Kim2020-04-031-5/+5
| |
| * Add test for command loggingDavid Kim2020-04-037-38/+35
| |
| * Add tests for loggingDavid Kim2020-03-303-0/+24
| |
| * Add git-archive-packStan Hu2020-03-263-12/+23
| |
| * Log git-{upload-pack,receive-pack} requestsStan Hu2020-03-262-0/+24
| | | | | | | | This restores the previous Ruby gitlab-shell behavior.
* | Merge branch 'id-testing-code-navigation' into 'master'Nick Thomas2020-03-301-0/+15
|\ \ | |/ |/| | | | | Include code-navigation block to CI See merge request gitlab-org/gitlab-shell!362
| * Include code-navigation block to CIIgor Drozdov2020-03-301-0/+15
|/
* Merge branch 'pb-update-codeowners' into 'master'Ash McKenzie2020-03-161-2/+1
|\ | | | | | | | | Update CODEOWNERS file See merge request gitlab-org/gitlab-shell!368
View Lorry Controller Status