summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix newlines not appearing between new log entriessh-fix-nonatomic-putsStan Hu2018-09-111-2/+3
* Merge branch 'sh-release-8.3.1' into 'master'v8.3.1Stan Hu2018-09-102-1/+4
|\
| * Release 8.3.1 to fix version numberingStan Hu2018-09-102-1/+4
|/
* Merge branch 'sh-release-8.3.0' into 'master'Stan Hu2018-09-072-1/+4
|\
| * Release v8.3.0sh-release-8.3.0Stan Hu2018-09-072-1/+4
|/
* Merge branch 'ash.mckenzie/custom-action-support' into 'master'v8.3.0Stan Hu2018-09-0716-56/+618
|\
| * 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
* | Merge branch 'sh-release-8.2.1' into 'master'v8.2.1Nick Thomas2018-09-072-1/+4
|\ \ | |/ |/|
| * 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
|\
| * /api/v4/allowed returns proper HTTP status codesAsh McKenzie2018-09-071-1/+2
| * 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.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 codeszj-fix-non-200-resp-codeZeger-Jan van de Weg2018-09-053-2/+10
|/
* Merge branch 'zj-cleanup-exec' into 'master'Nick Thomas2018-08-244-223/+52
|\
| * Clean up cmd_exec execution environmentZeger-Jan van de Weg2018-08-244-198/+43
| * 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
|\ \