summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Release v13.20.0Ash McKenzie2021-07-072-1/+9
|/ / / /
* | | | Merge branch '330494-geo-ssh-push-proxy-hanging-bug' into 'main'Ash McKenzie2021-07-075-8/+76
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Fix the Geo SSH push proxy hanging See merge request gitlab-org/gitlab-shell!487
| * | | Fix the Geo SSH push proxy hangingValery Sizov2021-07-015-8/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Geo SSH proxy push currently impossible when the only action that happens is branch removal. This fix works in a way that it waits for flush packet from git and then checks pkt lines to determine is pack data is expected. The thing is that git doesnt send pack data when only branch removal happens. Explanation is in https://gitlab.com/gitlab-org/gitlab/-/issues/330494
* | | | Merge branch 'remove-bin-authorized-keys' into 'main'Ash McKenzie2021-07-051-9/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove bin/authorized_keys See merge request gitlab-org/gitlab-shell!491
| * | | | Remove bin/authorized_keysNick Thomas2021-07-011-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We committed to removing this script in the 13.x release cycle, and it was announced then, but we never actually got around to it. Its functionality is completely replicated, in a safer manner, by the bin/gitlab-shell-authorized-keys script. Changelog: removed
* | | | | Merge branch '475-make-install' into 'main'Igor Drozdov2021-07-012-7/+38
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Add a make install command Closes #475 See merge request gitlab-org/gitlab-shell!490
| * | | | Add a make install commandNick Thomas2021-07-012-7/+38
| |/ / / | | | | | | | | | | | | Changelog: added
* | | | Merge branch 'fix-failing-spec' into 'main'Patrick Bajao2021-06-301-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Fix a failing spec See merge request gitlab-org/gitlab-shell!489
| * | | Fix a failing specNick Thomas2021-06-291-1/+1
|/ / / | | | | | | | | | | | | | | | | | | When the shell environment includes SSH_CONNECTION, one spec fails as the way we're stubbing the environment to the subprocess doesn't wipe out the pre-existing variable. This commit changes how we do it so the spec passes even in this environment.
* | | Merge branch 'id-create-process-page' into 'main'Nick Thomas2021-06-292-21/+46
|\ \ \ | |_|/ |/| | | | | | | | Create PROCESS.md page with Security release process See merge request gitlab-org/gitlab-shell!488
| * | Create PROCESS.md page with Security release processIgor Drozdov2021-06-232-21/+46
|/ /
* | Merge branch '140-standardize-logging-timestamp-format' into 'main'Patrick Bajao2021-06-212-1/+38
|\ \ | | | | | | | | | | | | | | | | | | Standardize logging timestamp format Closes #140 See merge request gitlab-org/gitlab-shell!485
| * | Adding a UTC converter and testGary Holtz2021-06-182-1/+38
|/ /
* | Merge branch 'brad-tense-correction' into 'main'Ash McKenzie2021-06-081-1/+1
|\ \ | | | | | | | | | | | | "Limits" to "Limit" on line 10 to align tenses See merge request gitlab-org/gitlab-shell!483
| * | "Limits" to "Limit" on line 10 to align tensesBrad Sevy2021-06-071-1/+1
|/ /
* | Merge branch 'release-13-19-0' into 'main'v13.19.0Nick Thomas2021-06-042-1/+8
|\ \ | | | | | | | | | | | | Release v13.19.0 See merge request gitlab-org/gitlab-shell!482
| * | Release v13.19.0Nick Thomas2021-06-042-1/+8
|/ /
* | Merge branch '500_git_upload_pack_test' into 'main'Patrick Bajao2021-06-041-0/+23
|\ \ | | | | | | | | | | | | Add acceptance test for git-upload-pack See merge request gitlab-org/gitlab-shell!477
| * | Add acceptance test for git-upload-packVasilii Iakliushin2021-06-011-0/+23
| | | | | | | | | | | | Contributes to https://gitlab.com/gitlab-org/gitlab-shell/-/issues/500
* | | Merge branch 'ps-upgrade-gitaly' into 'main'Nick Thomas2021-06-0411-29/+84
|\ \ \ | | | | | | | | | | | | | | | | fix: upgrade of the gitaly dependency See merge request gitlab-org/gitlab-shell!481
| * | | fix: upgrade of the gitaly dependencyPavlo Strokov2021-06-0211-29/+84
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitaly project now properly respects module release flow and includes a module suffix in the package name. It requires to re-write all non-suffixed imports with suffixed of a specific version of tha module. With proper module versioning we don't need to use a 'replace' directive to point to specific commit and can use semantic versioning for the gitaly dependency. Part of: https://gitlab.com/gitlab-org/gitaly/-/issues/3177
* | | Merge branch 'id-test-for-connection' into 'main'Nick Thomas2021-06-011-4/+34
|\ \ \ | |/ / |/| | | | | | | | Unit test wrong channel type See merge request gitlab-org/gitlab-shell!479
| * | Unit test wrong channel typeIgor Drozdov2021-06-011-4/+34
| | |
* | | Merge branch '500_git_upload_archive_test' into 'main'Nick Thomas2021-06-011-0/+18
|\ \ \ | |/ / |/| | | | | | | | Add acceptance test for git-upload-archive See merge request gitlab-org/gitlab-shell!478
| * | Add acceptance test for git-upload-archiveVasilii Iakliushin2021-06-011-0/+18
|/ / | | | | | | Contributes to https://gitlab.com/gitlab-org/gitlab-shell/-/issues/500
* | Merge branch '501-fix-opentracing-init' into 'main'Igor Drozdov2021-05-2416-93/+118
|\ \ | |/ |/| | | | | | | | | Fix opentracing setup for gitlab-sshd Closes #501 See merge request gitlab-org/gitlab-shell!473
| * Fix opentracing setup for gitlab-sshdNick Thomas2021-05-1716-93/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, opentracing (if configured) was initialized late in the gitlab-shell process's lifespan, coming just before making a gRPC call to Gitaly. By moving the opentracing initialization to be at process startup, we make it available for the whole process lifecycle, which is very useful to gitlab-sshd, as it means we'll only call tracing.Initialize() once on process startup, rather than once per SSH connection. To get this working, we need to introduce a context to gitlab-sshd. This carries the client/service name, but also carries an initial correlation ID. The main outcome of this is that all calls to the authorized_keys endpoint from a given gitlab-sshd process will now share a correlation ID. I don't have a strong opinion about this either way. Changelog: fixed
* | Merge branch 'add-gitaly-acceptance-test' into 'main'Nick Thomas2021-05-215-5/+105
|\ \ | | | | | | | | | | | | Add first Gitaly acceptance test See merge request gitlab-org/gitlab-shell!475
| * | Add a simple acceptance test for git-receive-packSean McGivern2021-05-202-5/+76
| | |
| * | Set up a test Gitaly server in CI and provide a docker-compose fileSean McGivern2021-05-203-0/+29
|/ /
* | Merge branch 'ps-upgrade-labkit' into 'main'Nick Thomas2021-05-202-103/+5
|\ \ | | | | | | | | | | | | fix: upgrade of the labkit dependency See merge request gitlab-org/gitlab-shell!474
| * | fix: upgrade of the labkit dependencyPavlo Strokov2021-05-202-103/+5
|/ / | | | | | | The labkit has a fix in the dependency chain b36f912 (Merge branch 'ps-fix-dep-version' into 'master', 2021-05-20).
* | Specify the working version for lsif-go image Igor Drozdov2021-05-191-1/+1
| | | | | | | | 1.4.0 has introduced the format change Since v1 means latest 1.* image, we're pulling the unsupported version
* | Merge branch 'acceptance-tests-simple' into 'main'Patrick Bajao2021-05-182-0/+126
|\ \ | |/ |/| | | | | Acceptance tests for 2fa_recovery_codes, 2fa_verify, and git-lfs-authenticate See merge request gitlab-org/gitlab-shell!472
| * Add acceptance test for git-lfs-authenticateSean McGivern2021-05-172-0/+49
| |
| * Add acceptance test for 2fa_verifySean McGivern2021-05-171-0/+32
| |
| * Add acceptance test for 2fa_recovery_codesSean McGivern2021-05-171-0/+45
|/
* Merge branch 'acceptance-test-personal-access-token' into 'main'Patrick Bajao2021-05-141-1/+15
|\ | | | | | | | | Add acceptance test for personal_access_token command See merge request gitlab-org/gitlab-shell!471
| * Add acceptance test for personal_access_token commandSean McGivern2021-05-131-1/+15
|/
* Merge branch '501-gitaly-respect-parent-context' into 'main'Nick Thomas2021-05-1013-41/+39
|\ | | | | | | | | Respect parent context for Gitaly calls See merge request gitlab-org/gitlab-shell!469
| * Respect parent context for Gitaly callsNick Thomas2021-05-0513-41/+39
| | | | | | | | | | | | | | | | | | Without these changes, Gitaly calls would not be linked to a parent context. This means that they would have an unassociated correlationID, and Gitaly RPC calls would not be cancel()ed by parent context cancellation. Changelog: fixed
* | Merge branch '501-remove-chdir-call' into 'main'Igor Drozdov2021-05-061-6/+0
|\ \ | | | | | | | | | | | | Stop changing directory to the filesystem root See merge request gitlab-org/gitlab-shell!470
| * | Stop changing directory to the filesystem rootNick Thomas2021-05-061-6/+0
|/ / | | | | | | | | | | | | | | | | | | | | This behaviour dates from when Gitaly RPCs were executed in Ruby by a Go subprocess. It's not needed for gitlab-shell now that it's in Go, and it's a very strange thing for gitlab-sshd. Best just to remove it. If we wanted to retain this behaviour, we could have an `os.Chdir` call in the gitlab-shell binary, but I just don't think it's needed. Changelog: fixed
* | Merge branch '478-update-labkit' into 'main'Igor Drozdov2021-05-052-18/+371
|\ \ | | | | | | | | | | | | | | | | | | Update LabKit to v1.4.0 Closes #478 See merge request gitlab-org/gitlab-shell!468
| * | Update LabKit to v1.4.0478-update-labkitNick Thomas2021-04-302-18/+371
| |/
* | Merge branch '516-handle-ssl-cert-dir-correctly' into 'main'Nick Thomas2021-05-045-87/+97
|\ \ | | | | | | | | | | | | | | | | | | gitlab-sshd: Respect the ssl_cert_dir config Closes #516 See merge request gitlab-org/gitlab-shell!467
| * | gitlab-sshd: Respect the ssl_cert_dir config516-handle-ssl-cert-dir-correctlyNick Thomas2021-04-305-87/+97
| |/ | | | | | | Changelog: fixed
* | Merge branch 'dont-close-span-early' into 'main'Stan Hu2021-04-301-1/+0
|\ \ | |/ |/| | | | | Don't finish the opentracing span early See merge request gitlab-org/gitlab-shell!466
| * Don't finish the opentracing span earlydont-close-span-earlyNick Thomas2021-04-301-1/+0
|/ | | | | | | | | Calling finished() in `ContextWithCorrelationID` breaks opentracing, since it expects us to call it just before exiting, and this defer runs on function completion. All existing users of ContextWithCorrelationID already `defer finish()` themselves, so this call is entirely surplus to requirements.
* Merge branch 'release-13-18-0' into 'main'v13.18.0Nick Thomas2021-04-262-1/+7
|\ | | | | | | | | Release v13.18.0 See merge request gitlab-org/gitlab-shell!465
View Lorry Controller Status