summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Release v8.3.0sh-release-8.3.0Stan Hu2018-09-072-1/+4
| | | | Includes custom action support for proxying SSH to a Geo secondary
* Merge branch 'ash.mckenzie/custom-action-support' into 'master'v8.3.0Stan Hu2018-09-0716-56/+618
|\ | | | | | | | | Custom Action support See merge request gitlab-org/gitlab-shell!215
| * Only decode result body if it has content upon custom action failureStan Hu2018-09-071-1/+3
| |
| * Custom Action supportash.mckenzie/custom-action-supportAsh McKenzie2018-09-0811-17/+564
| |
| * GitlabAccessStatus needs HTTP response status codeAsh McKenzie2018-09-073-13/+20
| |
| * Use constants for git commands in GitlabShellAsh McKenzie2018-09-071-6/+11
| |
| * New HTTPCodes moduleAsh McKenzie2018-09-071-0/+3
| |
| * GitAccessStatus initializer sensible defaultsAsh McKenzie2018-09-072-9/+2
| |
| * Move some GitlabNet requires into HTTPHelperAsh McKenzie2018-09-072-2/+2
| |
| * GitlabConfig, GitlabShell & GitlabKeys spec fixesAsh McKenzie2018-09-073-11/+16
| | | | | | | | GitlabConfig spec was relying upon real config.yml
* | Merge branch 'sh-release-8.2.1' into 'master'v8.2.1Nick Thomas2018-09-072-1/+4
|\ \ | |/ |/| | | | | Release gitlab-shell v8.2.1 See merge request gitlab-org/gitlab-shell!238
| * Release gitlab-shell v8.2.1sh-release-8.2.1Stan Hu2018-09-062-1/+4
|/
* Merge branch 'ash.mckenzie/allowed-api-proper-http-status-code-support' into ↵Stan Hu2018-09-073-1/+11
|\ | | | | | | | | | | | | | | | | 'master' Proper HTTP status code support for /api/v4/allowed API endpoint Closes gitlab-ce#51211 See merge request gitlab-org/gitlab-shell!237
| * /api/v4/allowed returns proper HTTP status codesAsh McKenzie2018-09-071-1/+2
| | | | | | | | | | * Previously, a 200 (OK) was sent when the user was unauthorised or the project was not found (or the user didn't have access) * We still treat 401 and 404 as 'success' but we need to explicitly handle them
| * New HTTPCodes moduleAsh McKenzie2018-09-072-0/+9
|/
* Merge branch '153-release-8-2-0' into 'master'v8.2.0Robert Speicher2018-09-052-1/+5
|\ | | | | | | | | | | | | Release gitlab-shell v8.2.0 Closes #153 See merge request gitlab-org/gitlab-shell!236
| * Release gitlab-shell v8.2.0Nick Thomas2018-09-052-1/+5
|/
* Merge branch 'zj-fix-non-200-resp-code' into 'master'Nick Thomas2018-09-053-2/+10
|\ | | | | | | | | | | | | Fix handling non 200 response codes Closes #152 See merge request gitlab-org/gitlab-shell!235
| * Fix handling non 200 response codeszj-fix-non-200-resp-codeZeger-Jan van de Weg2018-09-053-2/+10
|/ | | | | | | | | After the cleanup in https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/231 gitlab-shell mishandled the non 200 response codes. This commit removes another few lines of codes, which fixes this. Also now we test against this case through mocking. Fixes https://gitlab.com/gitlab-org/gitlab-shell/issues/152
* Merge branch 'zj-cleanup-exec' into 'master'Nick Thomas2018-08-244-223/+52
|\ | | | | | | | | | | | | Cleanup `git-upload-*` and `git-receive-*` related code Closes gitaly#1300 See merge request gitlab-org/gitlab-shell!232
| * Clean up cmd_exec execution environmentZeger-Jan van de Weg2018-08-244-198/+43
| | | | | | | | | | | | | | | | | | | | | | Given the gitaly-* now proxy the data from the client to the Gitaly server, the environment variables aren't used. Therefor we don't have to set them either. Only exception to the rule, is the GITALY_TOKEN. These changes also remove the `GIT_TRACE` options, introduced by 192e2bd367494bf66746c8971896a2d9cb84fc92. Part of: https://gitlab.com/gitlab-org/gitaly/issues/1300
| * Remove non Gitaly code pathsZeger-Jan van de Weg2018-08-202-39/+23
|/ | | | | | | All shell access goes through Gitaly, so dead code paths exist to support the legacy way too. This change mostly removes the dead code from `#process_cmd`.
* Merge branch 'zj-remove-repo-path' into 'master'Nick Thomas2018-08-174-43/+7
|\ | | | | | | | | | | | | Remove repo_path from GitlabShell Closes #135 See merge request gitlab-org/gitlab-shell!231
| * Remove repo_path from GitlabShellzj-remove-repo-pathZeger-Jan van de Weg2018-08-164-43/+7
|/ | | | | | | | | | | | | | | The internal api returns '/' from gitlab, since `8fad07383ada021fc995294fd0fe0f77fe37da35` from GitLab CE. To clean up later, https://gitlab.com/gitlab-org/gitlab-shell/issues/135 was created. This change closes that issue, making it possible to remove the field from the response on GitLab-CE too. Given the Rails app always returns `/` as the repository_path, the associated checks are basically a noop too. The tests are updated and at times look a little fishy, but those are testing code that is to be removed in another MR. Closes https://gitlab.com/gitlab-org/gitlab-shell/issues/135
* Merge branch 'rs-rspec' into 'master'Nick Thomas2018-08-1619-319/+303
|\ | | | | | | | | | | | | Update to RSpec 3 Closes #54 See merge request gitlab-org/gitlab-shell!229
| * 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
| | | | | | | | This defines `ROOT_PATH`, which we later stub.
| * 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
|\ | | | | | | | | | | | | Resolve "gitlab-shell 8.1.1 not on master" Closes #148 and #145 See merge request gitlab-org/gitlab-shell!230
| * Merge remote-tracking branch 'upstream/8-1-stable' into ↵Nick Thomas2018-08-146-3/+176
| |\ |/ / | | | | 148-merge-8-1-1-to-master
| * 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
| |\ | | | | | | | | | | | | Fix two regressions in SSH certificate support (8.1) See merge request gitlab-org/gitlab-shell!226
| | * 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 ↵Nick Thomas2018-08-092-4/+4
| | | | | | | | | | | | command line
| | * Fix two regressions in SSH certificate supportÆvar Arnfjörð Bjarmason2018-08-084-2/+172
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix two regressions in my 2e8b670 ("Add support for SSH certificate authentication", 2018-06-14) merged in gitlab-org/gitlab-shell!207. This fixes the issue noted in gitlab-org/gitlab-shell#145 where the command-line contains things other than the key/user/username, and also a regression where SSH certificates are being used, and the username presented in the key is unknown to GitLab. In that case, we should log the user in as "Anonymous" (on an instance that allows public access), but because of how the error checking around api.discover() was implemented we ended up erroring out instead.
* | Merge branch 'revert-refactor' into 'master'Robert Speicher2018-08-1466-2084/+1177
|\ \ | | | | | | | | | | | | | | | | | | Revert refactor Closes #147 See merge request gitlab-org/gitlab-shell!228
| * | Restore "Pass custom git_config_options to Gitalyo"Nick Thomas2018-08-1412-275/+473
| | | | | | | | | | | | This reverts commit 764f6f47fa6a8698ae033532ae49875a87030518.
| * | Revert "Merge branch 'ash.mckenzie/srp-refactor' into 'master'"Nick Thomas2018-08-1466-2077/+1164
| | | | | | | | | | | | | | | This reverts commit 3aaf4751e09262c53544a1987f59b1308af9b6c1, reversing changes made to c6577e0d75f51b017f2f332838b97c3ca5b497c0.
| * | Revert "Pass custom git_config_options to Gitalyo"Nick Thomas2018-08-1411-468/+276
|/ / | | | | | | This reverts commit f4ce4a3c31a9a7fb2fa0bb7daa185d34b8c03c00.
* | Merge branch 'sh-add-require-create-hooks' into 'master'Rémy Coutable2018-08-091-0/+1
|\ \ | | | | | | | | | | | | | | | | | | Add missing require statement in create-hooks Closes gitlab-ce#50160 See merge request gitlab-org/gitlab-shell!225
View Lorry Controller Status