summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add go:1.15 CI jobashmckenzie/golang-1-15Ash McKenzie2020-11-231-0/+7
|
* Merge branch 'fix-ci-config-for-main' into 'main'Igor Drozdov2020-11-202-5/+12
|\ | | | | | | | | Fix CI config and README for new default branch See merge request gitlab-org/gitlab-shell!437
| * Fix CI config and README for new default branchfix-ci-config-for-mainNick Thomas2020-11-202-5/+12
|/
* Merge branch 'client-identity' into 'master'Stan Hu2020-11-202-0/+79
|\ | | | | | | | | Propagate client identity to gitaly See merge request gitlab-org/gitlab-shell!436
| * Include key ID and type in metadataAsh McKenzie2020-11-202-1/+8
| |
| * use testhelper for SSH_CONNECTIONclient-identityIgor Wiedler2020-11-191-5/+5
| |
| * test for client identity propagationIgor Wiedler2020-11-191-0/+63
| |
| * Propagate client identity to gitalyIgor Wiedler2020-11-171-0/+9
| |
* | Merge branch 'ci-enable-secret-detection' into 'master'Ash McKenzie2020-11-181-0/+5
|\ \ | |/ |/| | | | | Enable Secret Detection in CI See merge request gitlab-org/gitlab-shell!434
| * Enable Secret Detection in CIci-enable-secret-detectionMichael Henriksen2020-11-171-0/+5
|/
* Merge branch 'gitlab-shell-release-13-13-0' into 'master'v13.13.0Patrick Bajao2020-11-172-1/+5
|\ | | | | | | | | Release v13.13.0 See merge request gitlab-org/gitlab-shell!433
| * Release v13.13.0gitlab-shell-release-13-13-0Ash McKenzie2020-11-172-1/+5
|/
* Merge branch 'pokstad1-tls-client-config' into 'master'Ash McKenzie2020-11-176-25/+199
|\ | | | | | | | | GitLab API Client support for client certificates See merge request gitlab-org/gitlab-shell!432
| * GitLab API Client support for client certificatesPaul Okstad2020-11-176-25/+199
|/
* Merge branch 'sh-release-13-12' into 'master'v13.12.0Igor Drozdov2020-11-062-1/+7
|\ | | | | | | | | Release v13.12.0 See merge request gitlab-org/gitlab-shell!431
| * Release v13.12.0Stan Hu2020-11-062-1/+7
|/
* Merge branch 'remove-rubocop-test' into 'master'Nick Thomas2020-11-050-0/+0
|\ | | | | | | | | Remove rubocop from Ruby test See merge request gitlab-org/gitlab-shell!430
* | Remove rubocop from Ruby testremove-rubocop-testTakuya Noguchi2020-11-056-103/+2
|/ | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* Merge branch '483-upgrade-bundler-from-1-17-2-to-2-1' into 'master'Stan Hu2020-11-040-0/+0
|\ | | | | | | | | | | | | Upgrade Bundler from 1.17.2 to 2.1.4 Closes #483 See merge request gitlab-org/gitlab-shell!428
* | Upgrade Bundler from 1.17.2 to 2.1.4483-upgrade-bundler-from-1-17-2-to-2-1Takuya Noguchi2020-11-042-3/+3
|/ | | | | | | https://gitlab.com/gitlab-org/gitlab-shell/-/merge_requests/426 https://gitlab.com/groups/gitlab-org/-/epics/2380 Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* Merge branch 'sh-log-content-length-bytes' into 'master'Patrick Bajao2020-11-032-0/+6
|\ | | | | | | | | Log Content-Length bytes in API response See merge request gitlab-org/gitlab-shell!427
| * Log Content-Length bytes in API resposneStan Hu2020-11-022-0/+6
| | | | | | | | | | This will be useful to measure bandwidth sent in response to an API request, particularly with measuring the /api/v4/internal/lfs endpoint.
* | Merge branch 'sh-update-ruby-2.7' into 'master'Stan Hu2020-10-231-1/+1
|\ \ | |/ |/| | | | | Bump default Ruby version to v2.7.2 See merge request gitlab-org/gitlab-shell!426
| * Bump default Ruby version to v2.7.2Stan Hu2020-10-231-1/+1
|/ | | | Part of https://gitlab.com/groups/gitlab-org/-/epics/2380
* Merge branch 'release-shell-13-11-0' into 'master'v13.11.0Nick Thomas2020-10-202-1/+7
|\ | | | | | | | | Release v13.11.0 See merge request gitlab-org/gitlab-shell!425
| * Release v13.11.0Nick Thomas2020-10-202-1/+7
|/
* Merge branch 'sh-fix-wrong-user-deploy-key-check' into 'master'Nick Thomas2020-10-202-25/+49
|\ | | | | | | | | Fix incorrect actor used to check permissions for SSH receive-pack See merge request gitlab-org/gitlab-shell!424
| * Fix incorrect actor used to check permissions for SSH receive-packsh-fix-wrong-user-deploy-key-checkStan Hu2020-10-192-25/+49
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | During a SSH receive-pack request (e.g. `git push`), gitlab-shell was incorrectly using the user returned by the `/internal/allowed` API endpoint to make an SSHReceivePack RPC call. This caused a number of problems with deploy keys with write access: 1. Keys that were generated by a blocked user would be denied the ability to write. 2. Keys that were generated by user that did not have write access to the project would also be denied. GitLab 12.4 removed the Ruby implementation of gitlab-shell in favor of the Golang implementation, and these implementations worked slightly differently. In https://gitlab.com/gitlab-org/gitlab-shell/blob/v10.1.0/lib/gitlab_shell.rb, the Ruby implementation would always use `@who` (e.g. `key-123`), but in gitlab-shell v10.2.0 the Go implementation would always use the user from the API response. Reads did not have this issue because the user/deploy key is never passed to Gitaly for additional permission checks. Writes need this information for the pre-receive to check access to protected branches, push rules, etc. Relates to https://gitlab.com/gitlab-org/gitlab-shell/-/issues/479
* Merge branch 'ashmckenzie/set-ssl-cert-dir-env-var' into 'master'Patrick Bajao2020-10-196-119/+94
|\ | | | | | | | | Set SSL_CERT_DIR env var when building command See merge request gitlab-org/gitlab-shell!423
| * Set SSL_CERT_DIR env var when building commandashmckenzie/set-ssl-cert-dir-env-varAsh McKenzie2020-10-192-46/+84
| |
| * Remove prefixing with SSL_CERT_DIRAsh McKenzie2020-10-194-73/+10
|/
* Merge branch 'sh-release-13-10-0' into 'master'v13.10.0Igor Drozdov2020-10-162-1/+4
|\ | | | | | | | | Release v13.10.0 See merge request gitlab-org/gitlab-shell!422
| * Release v13.10.0Stan Hu2020-10-152-1/+4
|/
* Merge branch 'sh-add-version-arg' into 'master'Ash McKenzie2020-10-162-1/+18
|\ | | | | | | | | Add support for -version argument See merge request gitlab-org/gitlab-shell!421
| * Apply 1 suggestion(s) to 1 file(s)sh-add-version-argStan Hu2020-10-161-1/+1
| |
| * Add support for -version argumentStan Hu2020-10-152-1/+18
|/ | | | | This will help determine the version of the binary particularly on Cloud Native GitLab, where VERSION may not be shipped with the binaries.
* Merge branch 'release-shell-13-9-0' into 'master'v13.9.0Nick Thomas2020-10-152-1/+6
|\ | | | | | | | | Release v13.9.0 See merge request gitlab-org/gitlab-shell!420
| * Release v13.9.0Nick Thomas2020-10-152-1/+6
|/
* Merge branch 'zj-remove-testify-assert' into 'master'Nick Thomas2020-10-1512-115/+104
|\ | | | | | | | | tests: Remove testify assert in favour of require See merge request gitlab-org/gitlab-shell!419
| * Merge branch 'master' into zj-remove-testify-assertNick Thomas2020-10-150-0/+0
| |\ | |/ |/|
* | Merge branch 'zj-override-user-agent' into 'master'Nick Thomas2020-10-152-2/+43
|\ \ | | | | | | | | | | | | client: Allow User-Agent header to be overridden See merge request gitlab-org/gitlab-shell!418
| | * tests: Replace assert with requirezj-remove-testify-assertZeger-Jan van de Weg2020-10-1512-115/+104
| |/ | | | | | | | | | | | | | | | | Testify features sub packages `assert` and `require`. The difference is subtle, and lost on novice Golang developers that don't read the docs. To create a more consistent code base `assert` will no longer be used. This change was generated by a running a sed command on all `_test.go` files, followed by `goimports -w`.
| * client: Allow User-Agent header to be overriddenzj-override-user-agentZeger-Jan van de Weg2020-10-142-2/+43
|/ | | | | | | | | | The user agent for requests to the internal API endpoints used the default Go provided user agent. This change updates that to always set something else, by default `GitLab-Shell`. Than for others importing the package, there's a new API to set it to something else. This has been done with new method, a setter, to maintain backwards compatibility in the API.
* Merge branch 'sh-suppress-random-correlation-id-log' into 'master'Ash McKenzie2020-10-131-1/+0
|\ | | | | | | | | Drop "generated random correlation ID" log message See merge request gitlab-org/gitlab-shell!417
| * Drop "generated random correlation ID" log messagesh-suppress-random-correlation-id-logStan Hu2020-10-131-1/+0
|/ | | | | | This message happens all the time and doesn't add a lot of value. Relates to https://gitlab.com/gitlab-com/gl-infra/delivery/-/issues/1275
* Merge branch 'release-13.8.0' into 'master'v13.8.0Igor Drozdov2020-10-022-1/+7
|\ | | | | | | | | Release v13.8.0 See merge request gitlab-org/gitlab-shell!416
| * Release v13.8.0Stan Hu2020-10-022-1/+7
|/
* Merge branch 'sh-update-gitaly-dep' into 'master'Nick Thomas2020-10-012-32/+68
|\ | | | | | | | | Update Gitaly module dependency See merge request gitlab-org/gitlab-shell!414
| * Update Gitaly module dependencysh-update-gitaly-depStan Hu2020-10-012-32/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This updates Gitaly's latest Protocol Buffer definitions, which were last updated in Feburary 2020, with the latest version of Gitaly. This is done to ensure the definitions are in sync with Workhorse (https://gitlab.com/gitlab-org/gitlab-workhorse/-/merge_requests/619) and Gitaly. Because we started tagging Gitaly versions `v13.x.x` instead of `v1.x.x`, `go get` refuses to update the Gitaly module using the latest tag or SHA (https://gitlab.com/gitlab-org/gitaly/-/issues/3177). Go tries to enforce semantic compatibility by requiring the use of module paths (e.g. `m/v13`), and Gitaly doesn't adhere to this scheme. To workaround this issue, we use the replace directive (https://github.com/golang/go/wiki/Modules#when-should-i-use-the-replace-directive): ``` go mod edit -replace gitlab.com/gitlab-org/gitaly=gitlab.com/gitlab-org/gitaly@3f5e218def93024f3aafe590c22cd1b29f744105 ```
* | Merge branch 'zj-config-secret' into 'master'Nick Thomas2020-10-011-0/+4
|\ \ | |/ |/| | | | | config: Set a secret example See merge request gitlab-org/gitlab-shell!415
View Lorry Controller Status