Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Vendor golang.org/x/sys/unix from mastervendor-updatejv-vendor-update | Jacob Vosmaer | 2018-12-07 | 181 | -8567/+51381 |
| | |||||
* | Vendor rot | Andrew Newdigate | 2018-12-07 | 23 | -5663/+2018 |
| | |||||
* | Update gialypb | Andrew Newdigate | 2018-12-07 | 1 | -0/+16 |
| | |||||
* | Gitaly client update | Andrew Newdigate | 2018-12-07 | 10 | -61/+184 |
| | |||||
* | More updates | Andrew Newdigate | 2018-12-07 | 33 | -2105/+2328 |
| | |||||
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-shell into vendor-update | Andrew Newdigate | 2018-12-07 | 53 | -2526/+7886 |
|\ | | | | | | | | | # Conflicts: # go/vendor/vendor.json | ||||
| * | Merge branch 'revert-0662bdd1' into 'master' | Nick Thomas | 2018-12-07 | 41 | -2530/+2243 |
| |\ | | | | | | | | | | | | | Revert "Merge branch 'zj-rename-gitalypb' into 'master'" See merge request gitlab-org/gitlab-shell!263 | ||||
| | * | Revert "Merge branch 'zj-rename-gitalypb' into 'master'"revert-0662bdd1 | Zeger-Jan van de Weg | 2018-12-07 | 41 | -2530/+2243 |
| |/ | | | | | This reverts merge request !262 | ||||
* | | Protobuf @ v1.2.0 | Andrew Newdigate | 2018-12-07 | 17 | -346/+324 |
| | | |||||
* | | Updated DNS resolver | Andrew Newdigate | 2018-12-07 | 4 | -114/+35 |
| | | |||||
* | | Updated vendoring | Andrew Newdigate | 2018-12-07 | 149 | -22868/+26172 |
|/ | |||||
* | Merge branch 'zj-rename-gitalypb' into 'master' | Nick Thomas | 2018-12-06 | 41 | -2243/+2530 |
|\ | | | | | | | | | Upgrade gitaly Client dependency See merge request gitlab-org/gitlab-shell!262 | ||||
| * | Upgrade gitaly Client dependency | Zeger-Jan van de Weg | 2018-12-06 | 41 | -2243/+2530 |
|/ | | | | | The client now has TLS support. So this gets pulled into this component. To make it work, we have to upgrade the proto too. | ||||
* | Merge branch 'sh-release-8-4-3' into 'master'v8.4.3 | Robert Speicher | 2018-11-28 | 2 | -1/+4 |
|\ | | | | | | | | | Release v8.4.3 See merge request gitlab-org/gitlab-shell!259 | ||||
| * | Release v8.4.3sh-release-8-4-3 | Stan Hu | 2018-11-28 | 2 | -1/+4 |
|/ | |||||
* | Merge branch 'sh-fix-circular-dependency-errors' into 'master' | Robert Speicher | 2018-11-28 | 3 | -3/+5 |
|\ | | | | | | | | | | | | | Remove circular dependency between HTTPHelper and GitlabNet Closes #169 See merge request gitlab-org/gitlab-shell!258 | ||||
| * | Remove circular dependency between HTTPHelper and GitlabNetsh-fix-circular-dependency-errors | Stan Hu | 2018-11-27 | 3 | -3/+5 |
|/ | | | | | | | | | HttpHelper depended on exceptions defined in GitLabNet, but GitLabNet included HttpHelper. Specs in Ruby 2.5 were breaking as a result of Action::Custom not able to reference constants in GitLabNet: https://gitlab.com/gitlab-org/gitlab-shell/-/jobs/126362702. Closes https://gitlab.com/gitlab-org/gitlab-shell/issues/169 | ||||
* | Merge branch 'release-8-4-2' into 'master'v8.4.2 | Nick Thomas | 2018-11-08 | 2 | -1/+4 |
|\ | | | | | | | | | Release v8.4.2 See merge request gitlab-org/gitlab-shell!255 | ||||
| * | Release v8.4.2 | Nick Thomas | 2018-11-08 | 2 | -1/+4 |
|/ | |||||
* | Merge branch 'ashmckenzie/8114-geo-push-ssh-lfs-http-auth-bug' into 'master' | Nick Thomas | 2018-11-08 | 5 | -26/+82 |
|\ | | | | | | | | | Include LFS operation when requesting auth See merge request gitlab-org/gitlab-shell!254 | ||||
| * | Include LFS operation when making auth requestashmckenzie/8114-geo-push-ssh-lfs-http-auth-bug | Ash McKenzie | 2018-11-08 | 5 | -26/+82 |
|/ | | | | Operation is either upload or download | ||||
* | Release v8.4.1v8.4.1 | Douwe Maan | 2018-10-25 | 2 | -1/+4 |
| | |||||
* | Merge branch 'add-http-gateway-time-out-handling' into 'master' | Douwe Maan | 2018-10-25 | 1 | -1/+1 |
|\ | | | | | | | | | Adds handling of Net::HTTPGatewayTimeOut exception to GitlabNet See merge request gitlab-org/gitlab-shell!251 | ||||
| * | Changes the HTTP error code from Gateway timeout to Service Unavailableadd-http-gateway-time-out-handling | Tiago Botelho | 2018-10-24 | 1 | -1/+1 |
| | | |||||
| * | Adds handling of Net::HTTPGatewayTimeOut exception to GitlabNet | Tiago Botelho | 2018-10-24 | 1 | -1/+1 |
|/ | |||||
* | Release v8.4.0v8.4.0 | Sean McGivern | 2018-10-10 | 1 | -1/+1 |
| | |||||
* | Merge branch 'gitaly-auth-v2' into 'master' | Sean McGivern | 2018-10-10 | 27 | -6/+1957 |
|\ | | | | | | | | | | | | | Use Gitaly's v2 auth scheme Closes gitaly#1319 See merge request gitlab-org/gitlab-shell!250 | ||||
| * | Use Gitaly's v2 auth schemegitaly-auth-v2 | Alejandro Rodríguez | 2018-10-09 | 27 | -6/+1957 |
|/ | |||||
* | Merge branch 'readme-overview' into 'master' | Douwe Maan | 2018-10-01 | 1 | -29/+19 |
|\ | | | | | | | | | Update overview in readme See merge request gitlab-org/gitlab-shell!248 | ||||
| * | Update overview in readme | Jacob Vosmaer | 2018-10-01 | 1 | -29/+19 |
|/ | |||||
* | Merge branch 'gitlab-shell-no-glid-argument' into 'master' | Nick Thomas | 2018-10-01 | 2 | -22/+1 |
|\ | | | | | | | | | | | | | Remove mistaken support for `gitlab-shell user-123` Closes #151 See merge request gitlab-org/gitlab-shell!247 | ||||
| * | Remove mistaken support for `gitlab-shell user-123`gitlab-shell-no-glid-argument | Jacob Vosmaer | 2018-09-28 | 2 | -22/+1 |
| | | |||||
* | | Merge branch '74-go-go-go-go-go' into 'master' | Douwe Maan | 2018-09-28 | 7 | -19/+130 |
|\ \ | |/ |/| | | | | | | | | | Feature flag for go/ruby gitlab-shell implementations Closes #74 See merge request gitlab-org/gitlab-shell!233 | ||||
| * | Allow the config directory to be specified | Nick Thomas | 2018-09-28 | 3 | -17/+31 |
| | | |||||
| * | Specify a richer scheme to run the migration with | Nick Thomas | 2018-09-28 | 4 | -28/+60 |
| | | |||||
| * | Run the Ruby specs in the "go:x.y" tests as well | Nick Thomas | 2018-09-28 | 1 | -7/+25 |
| | | | | | | | | | | | | Since the Go code now wraps the Ruby script, this makes sense and tests the interaction of the two codebases. Over time, the number of Ruby tests to run will approach 0. | ||||
| * | Initial feature-flagged go/ruby switch | Nick Thomas | 2018-09-28 | 6 | -6/+53 |
|/ | |||||
* | Merge branch 'ash.mckenzie/display-feedback-v2' into 'master' | Nick Thomas | 2018-09-25 | 9 | -88/+78 |
|\ | | | | | | | | | Display helpful feedback when proxying an SSH git push to secondary request (v2) See merge request gitlab-org/gitlab-shell!246 | ||||
| * | Display helpful feedback when proxying an SSH git push to secondary request ↵ | Ash McKenzie | 2018-09-25 | 9 | -88/+78 |
|/ | | | | (v2) | ||||
* | Merge branch '155-merge-8-3-3-into-master' into 'master' | Stan Hu | 2018-09-14 | 2 | -1/+4 |
|\ | | | | | | | | | | | | | Merge 8-3-stable branch changes into master Closes #155 See merge request gitlab-org/gitlab-shell!245 | ||||
| * | Release v8.3.3v8.3.38-3-stable | Nick Thomas | 2018-09-14 | 2 | -1/+4 |
| | | |||||
* | | Merge branch 'ash.mckenzie/display-feedback' into 'master' | Stan Hu | 2018-09-13 | 5 | -25/+162 |
|\ \ | |/ |/| | | | | | Display helpful feedback when proxying an SSH git push to secondary request See merge request gitlab-org/gitlab-shell!244 | ||||
| * | primary_repo can be a String or a Hashash.mckenzie/display-feedback | Ash McKenzie | 2018-09-13 | 1 | -34/+44 |
| | | |||||
| * | Print message to $stderr for custom action | Ash McKenzie | 2018-09-13 | 3 | -0/+111 |
| | | |||||
| * | Make ordered expectations around results output | Ash McKenzie | 2018-09-13 | 3 | -6/+21 |
| | | | | | | | | This also cleans up the output from the tests as previously, Base64 encoded output was printed. | ||||
| * | Consider 300 a successful response also | Ash McKenzie | 2018-09-13 | 1 | -1/+2 |
| | | |||||
* | | Merge branch '154-release-gitlab-shell-8-3-2' into 'master' | Stan Hu | 2018-09-12 | 2 | -1/+5 |
|\ \ | | | | | | | | | | | | | Release GitLab Shell v8.3.2 See merge request gitlab-org/gitlab-shell!243 | ||||
| * | | Release GitLab Shell v8.3.2sh-release-gitlab-shell-8-3-3 | Nick Thomas | 2018-09-12 | 2 | -1/+5 |
|/ / | |||||
* | | Merge branch 'sh-fix-nonatomic-puts' into 'master'v8.3.2 | Nick Thomas | 2018-09-12 | 1 | -2/+3 |
|\ \ | |/ |/| | | | | | | | | | Fix newlines not appearing between new log entries Closes gitlab-com/gl-infra/infrastructure#5017 See merge request gitlab-org/gitlab-shell!242 | ||||
| * | Fix newlines not appearing between new log entriessh-fix-nonatomic-puts | Stan Hu | 2018-09-11 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In https://gitlab.com/gitlab-com/gl-infra/infrastructure/issues/5017, we observed that lots of log messages were being dropped by Fluentd due to missing newlines. This occurs because there is a bug in Ruby where IO#puts calls write() twice: once to write the main text, and another to write the newline (https://bugs.ruby-lang.org/issues/14042). In a highly concurrent environment like GitLab.com, this can lead to interleaved newlines. A workaround is to use `IO#print` and append the newline ourselves. Closes https://gitlab.com/gitlab-com/gl-infra/infrastructure/issues/5017 |