summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Vendor golang.org/x/sys/unix from mastervendor-updatejv-vendor-updateJacob Vosmaer2018-12-07181-8567/+51381
* Vendor rotAndrew Newdigate2018-12-0723-5663/+2018
* Update gialypbAndrew Newdigate2018-12-071-0/+16
* Gitaly client updateAndrew Newdigate2018-12-0710-61/+184
* More updatesAndrew Newdigate2018-12-0733-2105/+2328
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-shell into vendor-updateAndrew Newdigate2018-12-0753-2526/+7886
|\
| * Merge branch 'revert-0662bdd1' into 'master'Nick Thomas2018-12-0741-2530/+2243
| |\
| | * Revert "Merge branch 'zj-rename-gitalypb' into 'master'"revert-0662bdd1Zeger-Jan van de Weg2018-12-0741-2530/+2243
| |/
* | Protobuf @ v1.2.0Andrew Newdigate2018-12-0717-346/+324
* | Updated DNS resolverAndrew Newdigate2018-12-074-114/+35
* | Updated vendoringAndrew Newdigate2018-12-07149-22868/+26172
|/
* Merge branch 'zj-rename-gitalypb' into 'master'Nick Thomas2018-12-0641-2243/+2530
|\
| * Upgrade gitaly Client dependencyZeger-Jan van de Weg2018-12-0641-2243/+2530
|/
* Merge branch 'sh-release-8-4-3' into 'master'v8.4.3Robert Speicher2018-11-282-1/+4
|\
| * Release v8.4.3sh-release-8-4-3Stan Hu2018-11-282-1/+4
|/
* Merge branch 'sh-fix-circular-dependency-errors' into 'master'Robert Speicher2018-11-283-3/+5
|\
| * Remove circular dependency between HTTPHelper and GitlabNetsh-fix-circular-dependency-errorsStan Hu2018-11-273-3/+5
|/
* Merge branch 'release-8-4-2' into 'master'v8.4.2Nick Thomas2018-11-082-1/+4
|\
| * Release v8.4.2Nick Thomas2018-11-082-1/+4
|/
* Merge branch 'ashmckenzie/8114-geo-push-ssh-lfs-http-auth-bug' into 'master'Nick Thomas2018-11-085-26/+82
|\
| * Include LFS operation when making auth requestashmckenzie/8114-geo-push-ssh-lfs-http-auth-bugAsh McKenzie2018-11-085-26/+82
|/
* Release v8.4.1v8.4.1Douwe Maan2018-10-252-1/+4
* Merge branch 'add-http-gateway-time-out-handling' into 'master'Douwe Maan2018-10-251-1/+1
|\
| * Changes the HTTP error code from Gateway timeout to Service Unavailableadd-http-gateway-time-out-handlingTiago Botelho2018-10-241-1/+1
| * Adds handling of Net::HTTPGatewayTimeOut exception to GitlabNetTiago Botelho2018-10-241-1/+1
|/
* Release v8.4.0v8.4.0Sean McGivern2018-10-101-1/+1
* Merge branch 'gitaly-auth-v2' into 'master'Sean McGivern2018-10-1027-6/+1957
|\
| * Use Gitaly's v2 auth schemegitaly-auth-v2Alejandro Rodríguez2018-10-0927-6/+1957
|/
* Merge branch 'readme-overview' into 'master'Douwe Maan2018-10-011-29/+19
|\
| * Update overview in readmeJacob Vosmaer2018-10-011-29/+19
|/
* Merge branch 'gitlab-shell-no-glid-argument' into 'master'Nick Thomas2018-10-012-22/+1
|\
| * Remove mistaken support for `gitlab-shell user-123`gitlab-shell-no-glid-argumentJacob Vosmaer2018-09-282-22/+1
* | Merge branch '74-go-go-go-go-go' into 'master'Douwe Maan2018-09-287-19/+130
|\ \ | |/ |/|
| * Allow the config directory to be specifiedNick Thomas2018-09-283-17/+31
| * Specify a richer scheme to run the migration withNick Thomas2018-09-284-28/+60
| * Run the Ruby specs in the "go:x.y" tests as wellNick Thomas2018-09-281-7/+25
| * Initial feature-flagged go/ruby switchNick Thomas2018-09-286-6/+53
|/
* Merge branch 'ash.mckenzie/display-feedback-v2' into 'master'Nick Thomas2018-09-259-88/+78
|\
| * Display helpful feedback when proxying an SSH git push to secondary request ...Ash McKenzie2018-09-259-88/+78
|/
* Merge branch '155-merge-8-3-3-into-master' into 'master'Stan Hu2018-09-142-1/+4
|\
| * Release v8.3.3v8.3.38-3-stableNick Thomas2018-09-142-1/+4
* | Merge branch 'ash.mckenzie/display-feedback' into 'master'Stan Hu2018-09-135-25/+162
|\ \ | |/ |/|
| * primary_repo can be a String or a Hashash.mckenzie/display-feedbackAsh McKenzie2018-09-131-34/+44
| * Print message to $stderr for custom actionAsh McKenzie2018-09-133-0/+111
| * Make ordered expectations around results outputAsh McKenzie2018-09-133-6/+21
| * Consider 300 a successful response alsoAsh McKenzie2018-09-131-1/+2
* | Merge branch '154-release-gitlab-shell-8-3-2' into 'master'Stan Hu2018-09-122-1/+5
|\ \
| * | Release GitLab Shell v8.3.2sh-release-gitlab-shell-8-3-3Nick Thomas2018-09-122-1/+5
|/ /
* | Merge branch 'sh-fix-nonatomic-puts' into 'master'v8.3.2Nick Thomas2018-09-121-2/+3
|\ \ | |/ |/|
| * Fix newlines not appearing between new log entriessh-fix-nonatomic-putsStan Hu2018-09-111-2/+3