diff options
author | Rubén Dávila <ruben@gitlab.com> | 2018-08-01 10:59:42 -0500 |
---|---|---|
committer | Rubén Dávila <ruben@gitlab.com> | 2018-08-01 10:59:42 -0500 |
commit | 35b9d71f8da81bb593f3b6bb0ef765b0f65f0d05 (patch) | |
tree | 8bbf7ad90af219c06fe7d43acdd240f5231ed1e9 | |
parent | 9e1dd0719778c90138545745cd23563c49359ce9 (diff) | |
download | gitlab-shell-rd-add-support-for-receive-max-input-size-option.tar.gz |
Update gitaly-proto to v0.111.0rd-add-support-for-receive-max-input-size-option
-rw-r--r-- | go/vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION | 2 | ||||
-rw-r--r-- | go/vendor/gitlab.com/gitlab-org/gitaly-proto/go/shared.pb.go | 85 | ||||
-rw-r--r-- | go/vendor/gitlab.com/gitlab-org/gitaly-proto/go/smarthttp.pb.go | 62 | ||||
-rw-r--r-- | go/vendor/gitlab.com/gitlab-org/gitaly-proto/go/ssh.pb.go | 66 | ||||
-rw-r--r-- | go/vendor/vendor.json | 10 | ||||
-rw-r--r-- | lib/gitlab_shell.rb | 2 |
6 files changed, 128 insertions, 99 deletions
diff --git a/go/vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION b/go/vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION index 8b27ad7..5af665a 100644 --- a/go/vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION +++ b/go/vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION @@ -1 +1 @@ -0.109.0 +0.111.0 diff --git a/go/vendor/gitlab.com/gitlab-org/gitaly-proto/go/shared.pb.go b/go/vendor/gitlab.com/gitlab-org/gitaly-proto/go/shared.pb.go index c4276b9..5cb1031 100644 --- a/go/vendor/gitlab.com/gitlab-org/gitaly-proto/go/shared.pb.go +++ b/go/vendor/gitlab.com/gitlab-org/gitaly-proto/go/shared.pb.go @@ -215,8 +215,9 @@ type Tag struct { // If message exceeds a certain threshold, it will be nullified, // but its size will be set in message_size so we can know if // a tag had a message in the first place. - Message []byte `protobuf:"bytes,4,opt,name=message,proto3" json:"message,omitempty"` - MessageSize int64 `protobuf:"varint,5,opt,name=message_size,json=messageSize" json:"message_size,omitempty"` + Message []byte `protobuf:"bytes,4,opt,name=message,proto3" json:"message,omitempty"` + MessageSize int64 `protobuf:"varint,5,opt,name=message_size,json=messageSize" json:"message_size,omitempty"` + Tagger *CommitAuthor `protobuf:"bytes,6,opt,name=tagger" json:"tagger,omitempty"` } func (m *Tag) Reset() { *m = Tag{} } @@ -259,6 +260,13 @@ func (m *Tag) GetMessageSize() int64 { return 0 } +func (m *Tag) GetTagger() *CommitAuthor { + if m != nil { + return m.Tagger + } + return nil +} + type User struct { GlId string `protobuf:"bytes,1,opt,name=gl_id,json=glId" json:"gl_id,omitempty"` Name []byte `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` @@ -312,40 +320,41 @@ func init() { func init() { proto.RegisterFile("shared.proto", fileDescriptor12) } var fileDescriptor12 = []byte{ - // 553 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x53, 0x5d, 0x6f, 0xd3, 0x30, - 0x14, 0x55, 0xd2, 0xb4, 0x5b, 0x6f, 0x33, 0x04, 0x66, 0x0f, 0xd1, 0xd0, 0xb4, 0x12, 0x5e, 0xf6, - 0x80, 0x32, 0x54, 0x24, 0xde, 0xc7, 0x87, 0xa6, 0xf1, 0x00, 0xc8, 0xdb, 0x9e, 0x23, 0xb7, 0xb9, - 0x73, 0x8d, 0x9c, 0xa6, 0xb2, 0x6f, 0x26, 0xb6, 0x27, 0x7e, 0x09, 0x7f, 0x8f, 0xbf, 0x81, 0x6c, - 0x27, 0xdd, 0x80, 0x0a, 0xf1, 0xe6, 0x7b, 0x7c, 0xee, 0xc7, 0xf1, 0xb9, 0x86, 0xd4, 0x2e, 0x85, - 0xc1, 0xaa, 0x58, 0x9b, 0x86, 0x1a, 0x36, 0x92, 0x8a, 0x84, 0xbe, 0x3d, 0x38, 0x92, 0x4d, 0x23, - 0x35, 0x9e, 0x78, 0x74, 0xde, 0x5e, 0x9f, 0x90, 0xaa, 0xd1, 0x92, 0xa8, 0xd7, 0x81, 0x98, 0x7f, - 0x8f, 0x01, 0x38, 0xae, 0x1b, 0xab, 0xa8, 0x31, 0xb7, 0xec, 0x39, 0xa4, 0x96, 0x1a, 0x23, 0x24, - 0x96, 0x2b, 0x51, 0x63, 0x16, 0x4f, 0xa3, 0xe3, 0x31, 0x9f, 0x74, 0xd8, 0x27, 0x51, 0x23, 0x7b, - 0x01, 0x7b, 0x06, 0xb5, 0x20, 0x75, 0x83, 0xe5, 0x5a, 0xd0, 0x32, 0x1b, 0x78, 0x4e, 0xda, 0x83, - 0x5f, 0x04, 0x2d, 0xd9, 0x2b, 0xd8, 0x97, 0x8a, 0xca, 0x66, 0xfe, 0x15, 0x17, 0x54, 0x56, 0xca, - 0xe0, 0xc2, 0xd5, 0xcf, 0x12, 0xcf, 0x65, 0x52, 0xd1, 0x67, 0x7f, 0xf5, 0xbe, 0xbf, 0x61, 0x67, - 0x30, 0x75, 0x19, 0x42, 0x13, 0x9a, 0x95, 0x20, 0xfc, 0x33, 0x57, 0xa1, 0xcd, 0x86, 0xd3, 0xc1, - 0xf1, 0x98, 0x1f, 0x4a, 0x45, 0xa7, 0x3d, 0xed, 0xf7, 0x32, 0x0a, 0xad, 0x9b, 0x4f, 0xea, 0xd2, - 0x6c, 0x34, 0x65, 0xa3, 0x30, 0x9f, 0xd4, 0xf7, 0x3a, 0x3f, 0x26, 0xbb, 0xd1, 0xe3, 0x98, 0x27, - 0x6e, 0xfe, 0xfc, 0x67, 0x04, 0xe3, 0x33, 0x45, 0xef, 0x9a, 0xba, 0x56, 0xc4, 0x1e, 0x41, 0xac, - 0xaa, 0x2c, 0xf2, 0x39, 0xb1, 0xaa, 0x58, 0x06, 0x3b, 0xb6, 0xf5, 0x4d, 0xfc, 0x63, 0xa4, 0xbc, - 0x0f, 0x19, 0x83, 0x64, 0xde, 0x54, 0xb7, 0x5e, 0x7f, 0xca, 0xfd, 0x99, 0xbd, 0x84, 0x91, 0x68, - 0x69, 0xd9, 0x18, 0xaf, 0x74, 0x32, 0xdb, 0x2f, 0x82, 0x11, 0x45, 0xa8, 0x7e, 0xea, 0xef, 0x78, - 0xc7, 0x61, 0x33, 0x18, 0x2f, 0x3c, 0x4e, 0x68, 0xb2, 0xe1, 0x3f, 0x12, 0xee, 0x69, 0xec, 0x10, - 0x60, 0x2d, 0x0c, 0xae, 0xa8, 0x54, 0x95, 0xcd, 0x46, 0xfe, 0x45, 0xc6, 0x01, 0x39, 0xaf, 0x2c, - 0x7b, 0x06, 0x63, 0x37, 0x48, 0x69, 0xd5, 0x1d, 0x66, 0x3b, 0xd3, 0xe8, 0x78, 0xc0, 0x77, 0x1d, - 0x70, 0xa1, 0xee, 0x30, 0x5f, 0x42, 0xfa, 0xb0, 0xac, 0x53, 0xe0, 0x5d, 0x8e, 0x82, 0x02, 0x77, - 0x66, 0xfb, 0x30, 0xc4, 0x5a, 0x28, 0xdd, 0xa9, 0x0d, 0x01, 0x2b, 0x20, 0xa9, 0x04, 0xa1, 0xd7, - 0x3a, 0x99, 0x1d, 0x14, 0x61, 0xad, 0x8a, 0x7e, 0xad, 0x8a, 0xcb, 0x7e, 0xad, 0xb8, 0xe7, 0xe5, - 0x39, 0xc0, 0x87, 0x6f, 0x8a, 0x2e, 0x48, 0x50, 0x6b, 0x5d, 0xcd, 0x1b, 0xa1, 0xdb, 0xd0, 0x68, - 0xc8, 0x43, 0x90, 0x5f, 0xc2, 0xe8, 0xad, 0x11, 0xab, 0xc5, 0x72, 0xeb, 0x1c, 0x6f, 0x60, 0x8f, - 0x84, 0x91, 0x48, 0x65, 0xd0, 0xee, 0xe7, 0x99, 0xcc, 0x9e, 0xf4, 0xef, 0xb3, 0x71, 0x8c, 0xa7, - 0x81, 0x17, 0xa2, 0xfc, 0x47, 0x04, 0x83, 0x4b, 0x21, 0xb7, 0xd6, 0x0c, 0xde, 0xc6, 0x1b, 0x6f, - 0xff, 0xea, 0x31, 0xf8, 0xaf, 0x1e, 0x6e, 0x27, 0x6a, 0xb4, 0x56, 0x48, 0xf4, 0x36, 0xa7, 0xbc, - 0x0f, 0xdd, 0xff, 0xe9, 0x8e, 0xc1, 0x81, 0xa1, 0x77, 0x60, 0xd2, 0x61, 0xde, 0x84, 0x6b, 0x48, - 0xae, 0x2c, 0x1a, 0xf6, 0x14, 0x86, 0x52, 0x97, 0x9b, 0x5d, 0x4b, 0xa4, 0x3e, 0xaf, 0x36, 0x53, - 0xc7, 0xdb, 0x1c, 0x19, 0x3c, 0x74, 0xe4, 0x08, 0x26, 0x52, 0x97, 0xad, 0x75, 0xdf, 0xa0, 0xc6, - 0xee, 0x63, 0x81, 0xd4, 0x57, 0x1d, 0x32, 0x1f, 0x79, 0x73, 0x5e, 0xff, 0x0a, 0x00, 0x00, 0xff, - 0xff, 0x82, 0x4d, 0xcd, 0xe4, 0x19, 0x04, 0x00, 0x00, + // 568 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x53, 0x5f, 0x6f, 0xd3, 0x3e, + 0x14, 0x55, 0xd2, 0xb4, 0x5b, 0x6f, 0xb3, 0x9f, 0x7e, 0x98, 0x3d, 0x44, 0x43, 0xd3, 0x4a, 0x78, + 0xd9, 0x03, 0xca, 0x50, 0x91, 0x78, 0x1f, 0x7f, 0x34, 0x8d, 0x07, 0x40, 0xde, 0xf6, 0x1c, 0xb9, + 0xcd, 0x9d, 0x6b, 0xe4, 0x34, 0x95, 0x7d, 0x33, 0xb1, 0x3d, 0xf1, 0x01, 0xf9, 0x1e, 0x7c, 0x0d, + 0x64, 0x3b, 0xe9, 0x06, 0x14, 0xc4, 0x9b, 0xef, 0xf1, 0xf1, 0xf5, 0x3d, 0x3e, 0xc7, 0x90, 0xda, + 0xa5, 0x30, 0x58, 0x15, 0x6b, 0xd3, 0x50, 0xc3, 0x46, 0x52, 0x91, 0xd0, 0xb7, 0x07, 0x47, 0xb2, + 0x69, 0xa4, 0xc6, 0x13, 0x8f, 0xce, 0xdb, 0xeb, 0x13, 0x52, 0x35, 0x5a, 0x12, 0xf5, 0x3a, 0x10, + 0xf3, 0xaf, 0x31, 0x00, 0xc7, 0x75, 0x63, 0x15, 0x35, 0xe6, 0x96, 0x3d, 0x85, 0xd4, 0x52, 0x63, + 0x84, 0xc4, 0x72, 0x25, 0x6a, 0xcc, 0xe2, 0x69, 0x74, 0x3c, 0xe6, 0x93, 0x0e, 0xfb, 0x20, 0x6a, + 0x64, 0xcf, 0x60, 0xcf, 0xa0, 0x16, 0xa4, 0x6e, 0xb0, 0x5c, 0x0b, 0x5a, 0x66, 0x03, 0xcf, 0x49, + 0x7b, 0xf0, 0x93, 0xa0, 0x25, 0x7b, 0x01, 0xfb, 0x52, 0x51, 0xd9, 0xcc, 0x3f, 0xe3, 0x82, 0xca, + 0x4a, 0x19, 0x5c, 0xb8, 0xfe, 0x59, 0xe2, 0xb9, 0x4c, 0x2a, 0xfa, 0xe8, 0xb7, 0xde, 0xf6, 0x3b, + 0xec, 0x0c, 0xa6, 0xee, 0x84, 0xd0, 0x84, 0x66, 0x25, 0x08, 0x7f, 0x3d, 0xab, 0xd0, 0x66, 0xc3, + 0xe9, 0xe0, 0x78, 0xcc, 0x0f, 0xa5, 0xa2, 0xd3, 0x9e, 0xf6, 0x73, 0x1b, 0x85, 0xd6, 0xcd, 0x27, + 0x75, 0x69, 0x36, 0x9a, 0xb2, 0x51, 0x98, 0x4f, 0xea, 0x7b, 0x9d, 0xef, 0x93, 0xdd, 0xe8, 0xff, + 0x98, 0x27, 0x6e, 0xfe, 0xfc, 0x7b, 0x04, 0xe3, 0x33, 0x45, 0x6f, 0x9a, 0xba, 0x56, 0xc4, 0xfe, + 0x83, 0x58, 0x55, 0x59, 0xe4, 0xcf, 0xc4, 0xaa, 0x62, 0x19, 0xec, 0xd8, 0xd6, 0x5f, 0xe2, 0x1f, + 0x23, 0xe5, 0x7d, 0xc9, 0x18, 0x24, 0xf3, 0xa6, 0xba, 0xf5, 0xfa, 0x53, 0xee, 0xd7, 0xec, 0x39, + 0x8c, 0x44, 0x4b, 0xcb, 0xc6, 0x78, 0xa5, 0x93, 0xd9, 0x7e, 0x11, 0x8c, 0x28, 0x42, 0xf7, 0x53, + 0xbf, 0xc7, 0x3b, 0x0e, 0x9b, 0xc1, 0x78, 0xe1, 0x71, 0x42, 0x93, 0x0d, 0xff, 0x72, 0xe0, 0x9e, + 0xc6, 0x0e, 0x01, 0xd6, 0xc2, 0xe0, 0x8a, 0x4a, 0x55, 0xd9, 0x6c, 0xe4, 0x5f, 0x64, 0x1c, 0x90, + 0xf3, 0xca, 0xb2, 0x27, 0x30, 0x76, 0x83, 0x94, 0x56, 0xdd, 0x61, 0xb6, 0x33, 0x8d, 0x8e, 0x07, + 0x7c, 0xd7, 0x01, 0x17, 0xea, 0x0e, 0xf3, 0x25, 0xa4, 0x0f, 0xdb, 0x3a, 0x05, 0xde, 0xe5, 0x28, + 0x28, 0x70, 0x6b, 0xb6, 0x0f, 0x43, 0xac, 0x85, 0xd2, 0x9d, 0xda, 0x50, 0xb0, 0x02, 0x92, 0x4a, + 0x10, 0x7a, 0xad, 0x93, 0xd9, 0x41, 0x11, 0x62, 0x55, 0xf4, 0xb1, 0x2a, 0x2e, 0xfb, 0x58, 0x71, + 0xcf, 0xcb, 0x73, 0x80, 0x77, 0x5f, 0x14, 0x5d, 0x90, 0xa0, 0xd6, 0xba, 0x9e, 0x37, 0x42, 0xb7, + 0xe1, 0xa2, 0x21, 0x0f, 0x45, 0x7e, 0x09, 0xa3, 0xd7, 0x46, 0xac, 0x16, 0xcb, 0xad, 0x73, 0xbc, + 0x82, 0x3d, 0x12, 0x46, 0x22, 0x95, 0x41, 0xbb, 0x9f, 0x67, 0x32, 0x7b, 0xd4, 0xbf, 0xcf, 0xc6, + 0x31, 0x9e, 0x06, 0x5e, 0xa8, 0xf2, 0x6f, 0x11, 0x0c, 0x2e, 0x85, 0xdc, 0xda, 0x33, 0x78, 0x1b, + 0x6f, 0xbc, 0xfd, 0xed, 0x8e, 0xc1, 0x3f, 0xdd, 0xe1, 0x32, 0x51, 0xa3, 0xb5, 0x42, 0xa2, 0xb7, + 0x39, 0xe5, 0x7d, 0xe9, 0xfe, 0x4f, 0xb7, 0x0c, 0x0e, 0x0c, 0xbd, 0x03, 0x93, 0x0e, 0x73, 0x26, + 0xb8, 0x88, 0x90, 0x90, 0x12, 0x8d, 0x0f, 0xe6, 0x1f, 0x23, 0x12, 0x38, 0xf9, 0x35, 0x24, 0x57, + 0x16, 0x0d, 0x7b, 0x0c, 0x43, 0xa9, 0xcb, 0x4d, 0x32, 0x13, 0xa9, 0xcf, 0xab, 0x8d, 0xc6, 0x78, + 0x9b, 0x7f, 0x83, 0x87, 0xfe, 0x1d, 0xc1, 0x44, 0xea, 0xb2, 0xb5, 0xee, 0xd3, 0xd4, 0xd8, 0x7d, + 0x43, 0x90, 0xfa, 0xaa, 0x43, 0xe6, 0x23, 0x6f, 0xe5, 0xcb, 0x1f, 0x01, 0x00, 0x00, 0xff, 0xff, + 0xf1, 0xe6, 0xc7, 0x44, 0x47, 0x04, 0x00, 0x00, } diff --git a/go/vendor/gitlab.com/gitlab-org/gitaly-proto/go/smarthttp.pb.go b/go/vendor/gitlab.com/gitlab-org/gitaly-proto/go/smarthttp.pb.go index 336d74d..11e99e3 100644 --- a/go/vendor/gitlab.com/gitlab-org/gitaly-proto/go/smarthttp.pb.go +++ b/go/vendor/gitlab.com/gitlab-org/gitaly-proto/go/smarthttp.pb.go @@ -140,6 +140,8 @@ type PostReceivePackRequest struct { GlUsername string `protobuf:"bytes,5,opt,name=gl_username,json=glUsername" json:"gl_username,omitempty"` // Git protocol version GitProtocol string `protobuf:"bytes,6,opt,name=git_protocol,json=gitProtocol" json:"git_protocol,omitempty"` + // Parameters to use with git -c (key=value pairs) + GitConfigOptions []string `protobuf:"bytes,7,rep,name=git_config_options,json=gitConfigOptions" json:"git_config_options,omitempty"` } func (m *PostReceivePackRequest) Reset() { *m = PostReceivePackRequest{} } @@ -189,6 +191,13 @@ func (m *PostReceivePackRequest) GetGitProtocol() string { return "" } +func (m *PostReceivePackRequest) GetGitConfigOptions() []string { + if m != nil { + return m.GitConfigOptions + } + return nil +} + type PostReceivePackResponse struct { // Raw data from stdout of 'git receive-pack' Data []byte `protobuf:"bytes,1,opt,name=data,proto3" json:"data,omitempty"` @@ -515,31 +524,32 @@ var _SmartHTTPService_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("smarthttp.proto", fileDescriptor13) } var fileDescriptor13 = []byte{ - // 413 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x52, 0xd1, 0x8a, 0xd3, 0x40, - 0x14, 0x75, 0xda, 0x6e, 0x61, 0x6f, 0xa3, 0x2d, 0x77, 0xd1, 0x0d, 0x01, 0xdd, 0x1a, 0x41, 0xf2, + // 423 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x53, 0xd1, 0x8a, 0xd3, 0x40, + 0x14, 0x75, 0xd2, 0x6e, 0x65, 0x6f, 0xa3, 0x2d, 0x77, 0xd1, 0x0d, 0x01, 0xdd, 0x1a, 0x41, 0xf2, 0xb0, 0x96, 0xa5, 0x7e, 0x82, 0x2f, 0x2e, 0x0a, 0x86, 0xd9, 0x2d, 0xf8, 0x16, 0xc6, 0x64, 0x3a, - 0x3b, 0x38, 0xcd, 0xc4, 0xcc, 0xb4, 0xd0, 0x1f, 0xf1, 0x3b, 0xfc, 0xa2, 0x7e, 0x8b, 0x34, 0x69, - 0x9a, 0xb6, 0x31, 0x22, 0x8a, 0x6f, 0xc3, 0xbd, 0x77, 0xce, 0x3d, 0xe7, 0xdc, 0x03, 0x43, 0xb3, - 0x60, 0xb9, 0x7d, 0xb0, 0x36, 0x9b, 0x64, 0xb9, 0xb6, 0x1a, 0xfb, 0x42, 0x5a, 0xa6, 0xd6, 0x9e, - 0x63, 0x1e, 0x58, 0xce, 0x93, 0xb2, 0xea, 0x7f, 0x27, 0x30, 0xbc, 0x4d, 0xe7, 0x9a, 0xf2, 0xb9, - 0xa1, 0xfc, 0xdb, 0x92, 0x1b, 0x8b, 0x53, 0x80, 0x9c, 0x67, 0xda, 0x48, 0xab, 0xf3, 0xb5, 0x4b, - 0xc6, 0x24, 0x18, 0x4c, 0x71, 0x52, 0x7e, 0x9f, 0xd0, 0x7d, 0x87, 0x1e, 0x4c, 0xe1, 0x35, 0xa0, - 0x90, 0x36, 0x8a, 0x75, 0x3a, 0x97, 0x22, 0xd2, 0x99, 0x95, 0x3a, 0x35, 0x6e, 0x67, 0xdc, 0x0d, - 0xce, 0xe9, 0x48, 0x48, 0xfb, 0xae, 0x68, 0x7c, 0x2a, 0xeb, 0xf8, 0x12, 0x9c, 0xed, 0x74, 0x41, - 0x21, 0xd6, 0xca, 0xed, 0x8e, 0x49, 0x70, 0x4e, 0x07, 0x42, 0xda, 0x70, 0x57, 0xf2, 0x5f, 0xc3, - 0xa8, 0xe6, 0x65, 0x32, 0x9d, 0x1a, 0x8e, 0x08, 0xbd, 0x84, 0x59, 0x56, 0x50, 0x72, 0x68, 0xf1, - 0xf6, 0x7f, 0x10, 0x78, 0x1a, 0x6a, 0x63, 0x67, 0x99, 0xd2, 0x2c, 0x09, 0x59, 0xfc, 0xf5, 0x5f, - 0x64, 0x54, 0x1b, 0x3a, 0xf5, 0x86, 0x16, 0x69, 0xdd, 0x3f, 0x94, 0xd6, 0x6b, 0x4a, 0xbb, 0x86, - 0x67, 0xa7, 0x8c, 0x7f, 0x23, 0x70, 0x43, 0xca, 0x71, 0xca, 0x63, 0x2e, 0x57, 0xfc, 0x7f, 0x28, - 0xbc, 0x80, 0x33, 0xa1, 0x22, 0x99, 0xec, 0xee, 0xd0, 0x13, 0xea, 0x36, 0xc1, 0x57, 0xf0, 0x58, - 0xa8, 0xe8, 0x00, 0xbf, 0x54, 0xe2, 0x08, 0x55, 0x23, 0xe3, 0x15, 0x0c, 0x84, 0x8a, 0x96, 0x86, - 0xe7, 0x29, 0x5b, 0x70, 0xf7, 0xac, 0x18, 0x01, 0xa1, 0x66, 0xbb, 0x4a, 0xc3, 0x8e, 0x7e, 0xd3, - 0x8e, 0x37, 0x70, 0xd9, 0xd0, 0xd7, 0xee, 0xc7, 0x74, 0xd3, 0x81, 0xd1, 0xdd, 0x36, 0xdb, 0xef, - 0xef, 0xef, 0xc3, 0x3b, 0x9e, 0xaf, 0x64, 0xcc, 0xf1, 0x03, 0x60, 0x95, 0x96, 0xda, 0x56, 0xbc, - 0xac, 0xbc, 0x38, 0x49, 0xb8, 0xe7, 0x36, 0x1b, 0xe5, 0x46, 0xff, 0xd1, 0x0d, 0xc1, 0x8f, 0x70, - 0x51, 0xd7, 0xf7, 0xa4, 0xfe, 0x16, 0x6d, 0x06, 0x4f, 0x8e, 0xaf, 0x8d, 0xcf, 0xab, 0xf9, 0x5f, - 0xe6, 0xd6, 0x7b, 0xd1, 0xd6, 0xae, 0x40, 0x03, 0x72, 0x43, 0xf0, 0x33, 0x0c, 0x4f, 0x5c, 0xc3, - 0xa3, 0x8f, 0xcd, 0xb8, 0x78, 0x57, 0xad, 0xfd, 0x43, 0xe4, 0x2f, 0xfd, 0xe2, 0x58, 0x6f, 0x7f, - 0x06, 0x00, 0x00, 0xff, 0xff, 0x7f, 0xae, 0x74, 0xb7, 0x42, 0x04, 0x00, 0x00, + 0x3b, 0x38, 0x9b, 0x89, 0x99, 0xd9, 0x85, 0xfe, 0x83, 0xcf, 0x7e, 0x87, 0x5f, 0xe4, 0xb7, 0x48, + 0x93, 0xa6, 0x69, 0x9b, 0x46, 0x44, 0xf1, 0x2d, 0xdc, 0x7b, 0x72, 0xee, 0x39, 0xe7, 0xde, 0x81, + 0x91, 0xb9, 0x65, 0x85, 0xbd, 0xb1, 0x36, 0x9f, 0xe6, 0x85, 0xb6, 0x1a, 0x07, 0x42, 0x5a, 0xa6, + 0x96, 0xbe, 0x6b, 0x6e, 0x58, 0xc1, 0xd3, 0xaa, 0x1a, 0x7c, 0x27, 0x30, 0xba, 0xcc, 0x16, 0x9a, + 0xf2, 0x85, 0xa1, 0xfc, 0xeb, 0x1d, 0x37, 0x16, 0x67, 0x00, 0x05, 0xcf, 0xb5, 0x91, 0x56, 0x17, + 0x4b, 0x8f, 0x4c, 0x48, 0x38, 0x9c, 0xe1, 0xb4, 0xfa, 0x7d, 0x4a, 0x37, 0x1d, 0xba, 0x85, 0xc2, + 0x73, 0x40, 0x21, 0x6d, 0x9c, 0xe8, 0x6c, 0x21, 0x45, 0xac, 0x73, 0x2b, 0x75, 0x66, 0x3c, 0x67, + 0xd2, 0x0b, 0x8f, 0xe9, 0x58, 0x48, 0xfb, 0xb6, 0x6c, 0x7c, 0xac, 0xea, 0xf8, 0x02, 0xdc, 0x15, + 0xba, 0x94, 0x90, 0x68, 0xe5, 0xf5, 0x26, 0x24, 0x3c, 0xa6, 0x43, 0x21, 0x6d, 0xb4, 0x2e, 0x05, + 0xaf, 0x60, 0xdc, 0xe8, 0x32, 0xb9, 0xce, 0x0c, 0x47, 0x84, 0x7e, 0xca, 0x2c, 0x2b, 0x25, 0xb9, + 0xb4, 0xfc, 0x0e, 0x7e, 0x10, 0x78, 0x12, 0x69, 0x63, 0xe7, 0xb9, 0xd2, 0x2c, 0x8d, 0x58, 0xf2, + 0xe5, 0x5f, 0x6c, 0xd4, 0x13, 0x9c, 0x66, 0x42, 0x87, 0xb5, 0xde, 0x1f, 0x5a, 0xeb, 0xb7, 0xad, + 0x9d, 0xc3, 0xd3, 0x7d, 0xc5, 0xbf, 0x31, 0xf8, 0xcd, 0xa9, 0xe0, 0x94, 0x27, 0x5c, 0xde, 0xf3, + 0xff, 0xe1, 0xf0, 0x04, 0x8e, 0x84, 0x8a, 0x65, 0xba, 0xde, 0x43, 0x5f, 0xa8, 0xcb, 0x14, 0x5f, + 0xc2, 0x23, 0xa1, 0xe2, 0x2d, 0xfe, 0xca, 0x89, 0x2b, 0x54, 0xc3, 0x8c, 0x67, 0x30, 0x14, 0x2a, + 0xbe, 0x33, 0xbc, 0xc8, 0xd8, 0x2d, 0xf7, 0x8e, 0x4a, 0x08, 0x08, 0x35, 0x5f, 0x57, 0x5a, 0x71, + 0x0c, 0x5a, 0x71, 0x74, 0xe4, 0xfb, 0xf0, 0x70, 0xbe, 0xc1, 0x6b, 0x38, 0x6d, 0xa5, 0xd1, 0x9d, + 0xde, 0xec, 0xa7, 0x03, 0xe3, 0xab, 0xd5, 0x4b, 0x78, 0x77, 0x7d, 0x1d, 0x5d, 0xf1, 0xe2, 0x5e, + 0x26, 0x1c, 0xdf, 0x03, 0xd6, 0xb7, 0xd5, 0x2c, 0x01, 0x4f, 0xeb, 0xe4, 0xf6, 0xde, 0x83, 0xef, + 0xb5, 0x1b, 0xd5, 0xc4, 0xe0, 0xc1, 0x05, 0xc1, 0x0f, 0x70, 0xd2, 0xd4, 0x37, 0xa2, 0xfe, 0x96, + 0x6d, 0x0e, 0x8f, 0x77, 0x6f, 0x03, 0x9f, 0xd5, 0xf8, 0x83, 0x57, 0xee, 0x3f, 0xef, 0x6a, 0xd7, + 0xa4, 0x21, 0xb9, 0x20, 0xf8, 0x09, 0x46, 0x7b, 0xa9, 0xe1, 0xce, 0x8f, 0xed, 0xe3, 0xf2, 0xcf, + 0x3a, 0xfb, 0xdb, 0xcc, 0x9f, 0x07, 0xe5, 0x6a, 0xdf, 0xfc, 0x0a, 0x00, 0x00, 0xff, 0xff, 0xf1, + 0x46, 0x34, 0x66, 0x70, 0x04, 0x00, 0x00, } diff --git a/go/vendor/gitlab.com/gitlab-org/gitaly-proto/go/ssh.pb.go b/go/vendor/gitlab.com/gitlab-org/gitaly-proto/go/ssh.pb.go index 656492e..a4f2fe5 100644 --- a/go/vendor/gitlab.com/gitlab-org/gitaly-proto/go/ssh.pb.go +++ b/go/vendor/gitlab.com/gitlab-org/gitaly-proto/go/ssh.pb.go @@ -109,6 +109,8 @@ type SSHReceivePackRequest struct { GlUsername string `protobuf:"bytes,5,opt,name=gl_username,json=glUsername" json:"gl_username,omitempty"` // Git protocol version GitProtocol string `protobuf:"bytes,6,opt,name=git_protocol,json=gitProtocol" json:"git_protocol,omitempty"` + // Parameters to use with git -c (key=value pairs) + GitConfigOptions []string `protobuf:"bytes,7,rep,name=git_config_options,json=gitConfigOptions" json:"git_config_options,omitempty"` } func (m *SSHReceivePackRequest) Reset() { *m = SSHReceivePackRequest{} } @@ -158,6 +160,13 @@ func (m *SSHReceivePackRequest) GetGitProtocol() string { return "" } +func (m *SSHReceivePackRequest) GetGitConfigOptions() []string { + if m != nil { + return m.GitConfigOptions + } + return nil +} + type SSHReceivePackResponse struct { // A chunk of raw data from 'git receive-pack' standard output Stdout []byte `protobuf:"bytes,1,opt,name=stdout,proto3" json:"stdout,omitempty"` @@ -507,33 +516,34 @@ var _SSHService_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("ssh.proto", fileDescriptor14) } var fileDescriptor14 = []byte{ - // 445 bytes of a gzipped FileDescriptorProto + // 452 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x53, 0xc1, 0x6e, 0xd3, 0x40, - 0x10, 0xc5, 0x8d, 0x13, 0x91, 0x89, 0x8b, 0xa2, 0xa5, 0x2d, 0x56, 0x04, 0xd4, 0x98, 0x8b, 0x0f, - 0x28, 0x42, 0xe9, 0x17, 0x20, 0x84, 0x54, 0xb8, 0x50, 0xad, 0x95, 0x13, 0x07, 0xcb, 0xd8, 0xc3, - 0x66, 0xc5, 0xd6, 0x6b, 0x76, 0x27, 0x51, 0x2b, 0x81, 0xf8, 0x09, 0xbe, 0x8b, 0x5f, 0xe0, 0x57, - 0x10, 0xb6, 0x09, 0x76, 0x4c, 0x6e, 0x90, 0x9b, 0x67, 0xde, 0xec, 0x9b, 0x79, 0x6f, 0xc6, 0x30, - 0xb6, 0x76, 0x35, 0x2f, 0x8d, 0x26, 0xcd, 0x46, 0x42, 0x52, 0xaa, 0x6e, 0x67, 0x9e, 0x5d, 0xa5, - 0x06, 0xf3, 0x3a, 0x1b, 0x7e, 0x77, 0xe0, 0x24, 0x8e, 0x2f, 0x97, 0xa5, 0xd2, 0x69, 0x7e, 0x95, - 0x66, 0x1f, 0x39, 0x7e, 0x5a, 0xa3, 0x25, 0xb6, 0x00, 0x30, 0x58, 0x6a, 0x2b, 0x49, 0x9b, 0x5b, - 0xdf, 0x09, 0x9c, 0x68, 0xb2, 0x60, 0xf3, 0x9a, 0x63, 0xce, 0xb7, 0x08, 0x6f, 0x55, 0xb1, 0x13, - 0x18, 0x5a, 0xca, 0x65, 0xe1, 0x1f, 0x05, 0x4e, 0xe4, 0xf1, 0x3a, 0x60, 0xcf, 0x80, 0x09, 0x49, - 0x49, 0xa6, 0x8b, 0x0f, 0x52, 0x24, 0xba, 0x24, 0xa9, 0x0b, 0xeb, 0xbb, 0xc1, 0x20, 0x1a, 0xf3, - 0xa9, 0x90, 0xf4, 0xb2, 0x02, 0xde, 0xd6, 0x79, 0xf6, 0x04, 0xbc, 0x5f, 0xd5, 0xd5, 0x74, 0x99, - 0x56, 0xfe, 0x30, 0x70, 0xa2, 0x31, 0x9f, 0x08, 0x49, 0x57, 0x4d, 0xea, 0x8d, 0x7b, 0x77, 0x30, - 0x75, 0xf9, 0x69, 0x8b, 0xb4, 0x4c, 0x4d, 0x7a, 0x8d, 0x84, 0xc6, 0x86, 0x9f, 0xe1, 0x74, 0x47, - 0x8f, 0x2d, 0x75, 0x61, 0x91, 0x9d, 0xc1, 0xc8, 0x52, 0xae, 0xd7, 0x54, 0x89, 0xf1, 0x78, 0x13, - 0x35, 0x79, 0x34, 0xa6, 0x99, 0xba, 0x89, 0xd8, 0x05, 0x4c, 0xf0, 0x46, 0x52, 0x62, 0x29, 0xa5, - 0xb5, 0xf5, 0x07, 0x5d, 0x07, 0x5e, 0xdd, 0x48, 0x8a, 0x2b, 0x84, 0x03, 0x6e, 0xbf, 0xc3, 0x1f, - 0x4e, 0xd5, 0x9e, 0x63, 0x86, 0x72, 0x83, 0xff, 0xc7, 0xcf, 0xfb, 0x30, 0x14, 0x2a, 0x91, 0x79, - 0x35, 0xd2, 0x98, 0xbb, 0x42, 0xbd, 0xce, 0xd9, 0x53, 0x38, 0x16, 0x2a, 0x69, 0x75, 0x70, 0x2b, - 0xd0, 0x13, 0xea, 0x0f, 0x37, 0x3b, 0x87, 0x89, 0x50, 0xc9, 0xda, 0xa2, 0x29, 0xd2, 0x6b, 0x6c, - 0xac, 0x05, 0xa1, 0x96, 0x4d, 0xa6, 0x67, 0xfe, 0xa8, 0x67, 0x7e, 0xf8, 0x05, 0xce, 0x76, 0x05, - 0x1e, 0xd2, 0xe0, 0x0c, 0x1e, 0x6c, 0xd7, 0xfb, 0xc2, 0x64, 0x2b, 0xb9, 0xc1, 0x7f, 0xee, 0x70, - 0xf8, 0x15, 0xfc, 0x7e, 0x93, 0x03, 0xaa, 0x5c, 0x7c, 0x3b, 0x02, 0x88, 0xe3, 0xcb, 0x18, 0xcd, - 0x46, 0x66, 0xc8, 0x38, 0x1c, 0x77, 0x6e, 0x9a, 0x3d, 0xfc, 0xfd, 0xfe, 0x6f, 0xbf, 0xee, 0xec, - 0xd1, 0x1e, 0xb4, 0x56, 0x10, 0xde, 0x89, 0x9c, 0xe7, 0x0e, 0x5b, 0xc2, 0xbd, 0xee, 0x1e, 0x59, - 0xfb, 0x59, 0xff, 0x80, 0x67, 0x8f, 0xf7, 0xc1, 0x1d, 0xda, 0x77, 0x30, 0xdd, 0xb5, 0x8e, 0x9d, - 0xf7, 0xe6, 0xe9, 0x6e, 0x6e, 0x16, 0xec, 0x2f, 0x68, 0x93, 0xbf, 0x1f, 0x55, 0x87, 0x79, 0xf1, - 0x33, 0x00, 0x00, 0xff, 0xff, 0xf7, 0x9a, 0x40, 0x97, 0xd6, 0x04, 0x00, 0x00, + 0x10, 0xc5, 0x89, 0x13, 0xc8, 0xc4, 0x45, 0xd1, 0xd2, 0x16, 0x2b, 0x02, 0x6a, 0xcc, 0xc5, 0x07, + 0x14, 0xa1, 0xf4, 0x0b, 0x10, 0x42, 0x2a, 0x5c, 0xa8, 0xd6, 0xca, 0x89, 0x83, 0x65, 0xec, 0x61, + 0xb3, 0x62, 0xeb, 0x35, 0xbb, 0x9b, 0xa8, 0x95, 0x40, 0x7c, 0x01, 0x37, 0xbe, 0x8b, 0x6f, 0x42, + 0xac, 0x4d, 0xb0, 0xe3, 0xfa, 0x06, 0xb9, 0x79, 0xe6, 0x8d, 0xdf, 0xcc, 0xbc, 0x37, 0x0b, 0x13, + 0xad, 0xd7, 0x8b, 0x52, 0x49, 0x23, 0xc9, 0x98, 0x71, 0x93, 0x8a, 0x9b, 0xb9, 0xa7, 0xd7, 0xa9, + 0xc2, 0xbc, 0xca, 0x86, 0x3f, 0x1d, 0x38, 0x8e, 0xe3, 0x8b, 0x55, 0x29, 0x64, 0x9a, 0x5f, 0xa6, + 0xd9, 0x27, 0x8a, 0x9f, 0x37, 0xa8, 0x0d, 0x59, 0x02, 0x28, 0x2c, 0xa5, 0xe6, 0x46, 0xaa, 0x1b, + 0xdf, 0x09, 0x9c, 0x68, 0xba, 0x24, 0x8b, 0x8a, 0x63, 0x41, 0x77, 0x08, 0x6d, 0x54, 0x91, 0x63, + 0x18, 0x69, 0x93, 0xf3, 0xc2, 0x1f, 0x04, 0x4e, 0xe4, 0xd1, 0x2a, 0x20, 0xcf, 0x81, 0x30, 0x6e, + 0x92, 0x4c, 0x16, 0x1f, 0x39, 0x4b, 0x64, 0x69, 0xb8, 0x2c, 0xb4, 0xef, 0x06, 0xc3, 0x68, 0x42, + 0x67, 0x8c, 0x9b, 0x57, 0x16, 0x78, 0x57, 0xe5, 0xc9, 0x53, 0xf0, 0x7e, 0x57, 0xdb, 0xe9, 0x32, + 0x29, 0xfc, 0x51, 0xe0, 0x44, 0x13, 0x3a, 0x65, 0xdc, 0x5c, 0xd6, 0xa9, 0xb7, 0xee, 0xbd, 0xe1, + 0xcc, 0xa5, 0x27, 0x0d, 0xd2, 0x32, 0x55, 0xe9, 0x15, 0x1a, 0x54, 0x3a, 0xfc, 0x02, 0x27, 0x7b, + 0xfb, 0xe8, 0x52, 0x16, 0x1a, 0xc9, 0x29, 0x8c, 0xb5, 0xc9, 0xe5, 0xc6, 0xd8, 0x65, 0x3c, 0x5a, + 0x47, 0x75, 0x1e, 0x95, 0xaa, 0xa7, 0xae, 0x23, 0x72, 0x0e, 0x53, 0xbc, 0xe6, 0x26, 0xd1, 0x26, + 0x35, 0x1b, 0xed, 0x0f, 0xdb, 0x0a, 0xbc, 0xbe, 0xe6, 0x26, 0xb6, 0x08, 0x05, 0xdc, 0x7d, 0x87, + 0xdf, 0x07, 0xb6, 0x3d, 0xc5, 0x0c, 0xf9, 0x16, 0xff, 0x8f, 0x9e, 0x0f, 0x60, 0xc4, 0x44, 0xc2, + 0x73, 0x3b, 0xd2, 0x84, 0xba, 0x4c, 0xbc, 0xc9, 0xc9, 0x33, 0x38, 0x62, 0x22, 0x69, 0x74, 0x70, + 0x2d, 0xe8, 0x31, 0xf1, 0x97, 0x9b, 0x9c, 0xc1, 0x94, 0x89, 0x64, 0xa3, 0x51, 0x15, 0xe9, 0x15, + 0xd6, 0xd2, 0x02, 0x13, 0xab, 0x3a, 0xd3, 0x11, 0x7f, 0xdc, 0x11, 0xbf, 0xc7, 0xcd, 0xbb, 0xb7, + 0xbb, 0x19, 0x7e, 0x85, 0xd3, 0x7d, 0x39, 0x0e, 0x69, 0x47, 0x06, 0x0f, 0x77, 0xc7, 0xf0, 0x52, + 0x65, 0x6b, 0xbe, 0xc5, 0x7f, 0xee, 0x47, 0xf8, 0x0d, 0xfc, 0x6e, 0x93, 0x03, 0x6e, 0xb9, 0xfc, + 0x31, 0x00, 0x88, 0xe3, 0x8b, 0x18, 0xd5, 0x96, 0x67, 0x48, 0x28, 0x1c, 0xb5, 0x5e, 0x00, 0x79, + 0xf4, 0xe7, 0xff, 0xdb, 0x1e, 0xfa, 0xfc, 0x71, 0x0f, 0x5a, 0x6d, 0x10, 0xde, 0x89, 0x9c, 0x17, + 0x0e, 0x59, 0xc1, 0xfd, 0xb6, 0x8f, 0xa4, 0xf9, 0x5b, 0xf7, 0xdc, 0xe7, 0x4f, 0xfa, 0xe0, 0x16, + 0xed, 0x7b, 0x98, 0xed, 0x4b, 0x47, 0xce, 0x3a, 0xf3, 0xb4, 0x9d, 0x9b, 0x07, 0xfd, 0x05, 0x4d, + 0xf2, 0x0f, 0x63, 0x7b, 0xc6, 0xe7, 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0x1e, 0x98, 0x8e, 0xd7, + 0x04, 0x05, 0x00, 0x00, } diff --git a/go/vendor/vendor.json b/go/vendor/vendor.json index c71b230..707c0a1 100644 --- a/go/vendor/vendor.json +++ b/go/vendor/vendor.json @@ -41,13 +41,13 @@ "versionExact": "v1.0.5" }, { - "checksumSHA1": "RRkpmIDyoI4sb+EHc5I9m1Q8eJc=", + "checksumSHA1": "vUV1LtieFxBV3E9N60Z1/CYrLQo=", "path": "gitlab.com/gitlab-org/gitaly-proto/go", - "revision": "db2cc649cf77ebe5b3b2672672888522060145d6", - "revisionTime": "2018-07-20T09:14:50Z", + "revision": "b26cda22da41c708d18be78c519a38810acfdc80", + "revisionTime": "2018-07-31T12:04:23Z", "tree": true, - "version": "v0.109.0", - "versionExact": "v0.109.0" + "version": "v0.111.0", + "versionExact": "v0.111.0" }, { "checksumSHA1": "dUHJbKas746n5fLzlwxHb6FOCxs=", diff --git a/lib/gitlab_shell.rb b/lib/gitlab_shell.rb index d13d4ba..3420dda 100644 --- a/lib/gitlab_shell.rb +++ b/lib/gitlab_shell.rb @@ -118,8 +118,8 @@ class GitlabShell # rubocop:disable Metrics/ClassLength self.repo_path = status.repository_path @gl_repository = status.gl_repository - @git_protocol = ENV['GIT_PROTOCOL'] @git_config_options = status.git_config_options + @git_protocol = ENV['GIT_PROTOCOL'] @gitaly = status.gitaly @username = status.gl_username if defined?(@who) |