diff options
| author | Jacob Vosmaer (GitLab) <jacob@gitlab.com> | 2017-05-30 17:51:29 +0300 |
|---|---|---|
| committer | Jacob Vosmaer (GitLab) <jacob@gitlab.com> | 2017-05-30 17:51:29 +0300 |
| commit | 7bf0ae336c72e06aac5c2407535e02c0503a515d (patch) | |
| tree | ca82f14a262917a11705c483823cc81c6ef6f3c9 | |
| parent | 78ff6ab9ff1098c6cf2a0fb7abcb97ab0f505fd5 (diff) | |
| parent | 65fd92b3f9b9066fe3e202d2b2eb0fb513f9905e (diff) | |
Merge branch 'gl_protocol' into 'master'
Set GL_PROTOCOL during SmartHTTP.PostReceivePack
Closes #204
See merge request !169
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | internal/service/smarthttp/receive_pack.go | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 8354e702a..3033aa193 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,8 @@ UNRELEASED https://gitlab.com/gitlab-org/gitaly/merge_requests/164 - Add support for structured logging via logrus https://gitlab.com/gitlab-org/gitaly/merge_requests/163 +- Set GL_PROTOCOL during SmartHTTP.PostReceivePack + https://gitlab.com/gitlab-org/gitaly/merge_requests/169 v0.10.0 diff --git a/internal/service/smarthttp/receive_pack.go b/internal/service/smarthttp/receive_pack.go index 457b30fa1..aaf084b4b 100644 --- a/internal/service/smarthttp/receive_pack.go +++ b/internal/service/smarthttp/receive_pack.go @@ -29,7 +29,10 @@ func (s *server) PostReceivePack(stream pb.SmartHTTP_PostReceivePackServer) erro stdout := pbhelper.NewSendWriter(func(p []byte) error { return stream.Send(&pb.PostReceivePackResponse{Data: p}) }) - env := []string{fmt.Sprintf("GL_ID=%s", req.GlId)} + env := []string{ + fmt.Sprintf("GL_ID=%s", req.GlId), + "GL_PROTOCOL=http", + } if req.GlRepository != "" { env = append(env, fmt.Sprintf("GL_REPOSITORY=%s", req.GlRepository)) } |