Merge branch '765-commit-filter-shas-with-signature' into 'master'

CommitService::FilterShasWithSignatures Server Implementation

Closes #765

See merge request gitlab-org/gitaly!461

12 files changed, 602 insertions, 143 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 75c93b132..2881f638d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@ UNRELEASED
   https://gitlab.com/gitlab-org/gitaly/merge_requests/466
 - Fix a panic in ListFiles RPC when git process is killed abruptly
   https://gitlab.com/gitlab-org/gitaly/merge_requests/460
+- Implement CommitService::FilterShasWithSignatures
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/461
 
 v0.55.0
 
diff --git a/internal/service/commit/filter_shas_with_signatures.go b/internal/service/commit/filter_shas_with_signatures.go
new file mode 100644
index 000000000..f3ed01181
--- /dev/null
+++ b/internal/service/commit/filter_shas_with_signatures.go
@@ -0,0 +1,66 @@
+package commit
+
+import (
+	pb "gitlab.com/gitlab-org/gitaly-proto/go"
+	"gitlab.com/gitlab-org/gitaly/internal/rubyserver"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/codes"
+)
+
+func (s *server) FilterShasWithSignatures(bidi pb.CommitService_FilterShasWithSignaturesServer) error {
+	firstRequest, err := bidi.Recv()
+	if err != nil {
+		return err
+	}
+
+	if err = verifyFirstFilterShasWithSignaturesRequest(firstRequest); err != nil {
+		return err
+	}
+
+	ctx := bidi.Context()
+	client, err := s.CommitServiceClient(ctx)
+	if err != nil {
+		return err
+	}
+
+	clientCtx, err := rubyserver.SetHeaders(ctx, firstRequest.GetRepository())
+	if err != nil {
+		return err
+	}
+
+	rubyBidi, err := client.FilterShasWithSignatures(clientCtx)
+	if err != nil {
+		return err
+	}
+
+	if err := rubyBidi.Send(firstRequest); err != nil {
+		return err
+	}
+
+	return rubyserver.ProxyBidi(
+		func() error {
+			request, err := bidi.Recv()
+			if err != nil {
+				return err
+			}
+
+			return rubyBidi.Send(request)
+		},
+		rubyBidi,
+		func() error {
+			response, err := rubyBidi.Recv()
+			if err != nil {
+				return err
+			}
+
+			return bidi.Send(response)
+		},
+	)
+}
+
+func verifyFirstFilterShasWithSignaturesRequest(in *pb.FilterShasWithSignaturesRequest) error {
+	if in.Repository == nil {
+		return grpc.Errorf(codes.InvalidArgument, "no repository given")
+	}
+	return nil
+}
diff --git a/internal/service/commit/filter_shas_with_signatures_test.go b/internal/service/commit/filter_shas_with_signatures_test.go
new file mode 100644
index 000000000..48b545c4b
--- /dev/null
+++ b/internal/service/commit/filter_shas_with_signatures_test.go
@@ -0,0 +1,95 @@
+package commit
+
+import (
+	"io"
+	"testing"
+
+	"google.golang.org/grpc/codes"
+
+	"github.com/stretchr/testify/require"
+
+	pb "gitlab.com/gitlab-org/gitaly-proto/go"
+	"gitlab.com/gitlab-org/gitaly/internal/testhelper"
+)
+
+func TestFilterShasWithSignaturesSuccessful(t *testing.T) {
+	ctx, cancel := testhelper.Context()
+	defer cancel()
+
+	server, serverSocketPath := startTestServices(t)
+	defer server.Stop()
+
+	client, conn := newCommitServiceClient(t, serverSocketPath)
+	defer conn.Close()
+
+	testCases := []struct {
+		desc string
+		in   [][]byte
+		out  [][]byte
+	}{
+		{
+			desc: "3 shas, none signed",
+			in:   [][]byte{[]byte("6907208d755b60ebeacb2e9dfea74c92c3449a1f"), []byte("c347ca2e140aa667b968e51ed0ffe055501fe4f4"), []byte("d59c60028b053793cecfb4022de34602e1a9218e")},
+			out:  nil,
+		},
+		{
+			desc: "3 shas, all signed",
+			in:   [][]byte{[]byte("5937ac0a7beb003549fc5fd26fc247adbce4a52e"), []byte("570e7b2abdd848b95f2f578043fc23bd6f6fd24d"), []byte("6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9")},
+			out:  [][]byte{[]byte("5937ac0a7beb003549fc5fd26fc247adbce4a52e"), []byte("570e7b2abdd848b95f2f578043fc23bd6f6fd24d"), []byte("6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9")},
+		},
+		{
+			desc: "3 shas, middle unsigned",
+			in:   [][]byte{[]byte("5937ac0a7beb003549fc5fd26fc247adbce4a52e"), []byte("66eceea0db202bb39c4e445e8ca28689645366c5"), []byte("6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9")},
+			out:  [][]byte{[]byte("5937ac0a7beb003549fc5fd26fc247adbce4a52e"), []byte("6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9")},
+		},
+		{
+			desc: "3 shas, middle non-existant",
+			in:   [][]byte{[]byte("5937ac0a7beb003549fc5fd26fc247adbce4a52e"), []byte("deadf00d00000000000000000000000000000000"), []byte("6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9")},
+			out:  [][]byte{[]byte("5937ac0a7beb003549fc5fd26fc247adbce4a52e"), []byte("6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9")},
+		},
+	}
+
+	for _, testCase := range testCases {
+		t.Run(testCase.desc, func(t *testing.T) {
+			stream, err := client.FilterShasWithSignatures(ctx)
+			require.NoError(t, err)
+			require.NoError(t, stream.Send(&pb.FilterShasWithSignaturesRequest{Repository: testRepo, Shas: testCase.in}))
+			require.NoError(t, stream.CloseSend())
+			recvOut, err := recvFSWS(stream)
+			require.NoError(t, err)
+			require.Equal(t, testCase.out, recvOut)
+		})
+	}
+}
+
+func TestFilterShasWithSignaturesValidationError(t *testing.T) {
+	ctx, cancel := testhelper.Context()
+	defer cancel()
+
+	server, serverSocketPath := startTestServices(t)
+	defer server.Stop()
+
+	client, conn := newCommitServiceClient(t, serverSocketPath)
+	defer conn.Close()
+
+	stream, err := client.FilterShasWithSignatures(ctx)
+	require.NoError(t, err)
+
+	require.NoError(t, stream.Send(&pb.FilterShasWithSignaturesRequest{}))
+	require.NoError(t, stream.CloseSend())
+
+	_, err = recvFSWS(stream)
+	testhelper.AssertGrpcError(t, err, codes.InvalidArgument, "no repo")
+}
+
+func recvFSWS(stream pb.CommitService_FilterShasWithSignaturesClient) ([][]byte, error) {
+	var ret [][]byte
+	resp, err := stream.Recv()
+	for ; err == nil; resp, err = stream.Recv() {
+		ret = append(ret, resp.GetShas()...)
+	}
+	if err != io.EOF {
+		return nil, err
+	}
+	return ret, nil
+}
diff --git a/internal/service/operations/user_cherry_pick.go b/internal/service/operations/user_cherry_pick.go
new file mode 100644
index 000000000..4ecc58ef5
--- /dev/null
+++ b/internal/service/operations/user_cherry_pick.go
@@ -0,0 +1,13 @@
+package operations
+
+import (
+	"golang.org/x/net/context"
+
+	"gitlab.com/gitlab-org/gitaly/internal/helper"
+
+	pb "gitlab.com/gitlab-org/gitaly-proto/go"
+)
+
+func (s *server) UserCherryPick(ctx context.Context, in *pb.UserCherryPickRequest) (*pb.UserCherryPickResponse, error) {
+	return nil, helper.Unimplemented
+}
diff --git a/ruby/Gemfile b/ruby/Gemfile
index 3055ec8b2..46f55431a 100644
--- a/ruby/Gemfile
+++ b/ruby/Gemfile
@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 gem 'github-linguist', '~> 4.7.0', require: 'linguist'
-gem 'gitaly-proto', '~> 0.54.0', require: 'gitaly'
+gem 'gitaly-proto', '~> 0.55.0', require: 'gitaly'
 gem 'activesupport'
 gem 'gollum-lib', '~> 4.2', require: false
 gem 'gollum-rugged_adapter', '~> 0.4.4', require: false
diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock
index 25daf8e09..be93f7528 100644
--- a/ruby/Gemfile.lock
+++ b/ruby/Gemfile.lock
@@ -17,7 +17,7 @@ GEM
       multipart-post (>= 1.2, < 3)
     gemojione (3.3.0)
       json
-    gitaly-proto (0.54.0)
+    gitaly-proto (0.55.0)
       google-protobuf (~> 3.1)
       grpc (~> 1.0)
     github-linguist (4.7.6)
@@ -119,7 +119,7 @@ PLATFORMS
 
 DEPENDENCIES
   activesupport
-  gitaly-proto (~> 0.54.0)
+  gitaly-proto (~> 0.55.0)
   github-linguist (~> 4.7.0)
   gitlab-styles (~> 2.0.0)
   gollum-lib (~> 4.2)
diff --git a/ruby/lib/gitaly_server/commit_service.rb b/ruby/lib/gitaly_server/commit_service.rb
index 91a0f2603..a04c74726 100644
--- a/ruby/lib/gitaly_server/commit_service.rb
+++ b/ruby/lib/gitaly_server/commit_service.rb
@@ -47,5 +47,21 @@ module GitalyServer
         end
       end
     end
+
+    def filter_shas_with_signatures(session, call)
+      Enumerator.new do |y|
+        bridge_exceptions do
+          repository = nil
+
+          call.each_remote_read.with_index do |request, index|
+            if index.zero?
+              repository = Gitlab::Git::Repository.from_gitaly(request.repository, call)
+            end
+
+            y << Gitaly::FilterShasWithSignaturesResponse.new(shas: Gitlab::Git::Commit.shas_with_signatures(repository, request.shas))
+          end
+        end
+      end
+    end
   end
 end
diff --git a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION
index 524456c77..316ba4bd9 100644
--- a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION
+++ b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION
@@ -1 +1 @@
-0.54.0
+0.55.0
diff --git a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/blob.pb.go b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/blob.pb.go
index cba71de27..fac146cbc 100644
--- a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/blob.pb.go
+++ b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/blob.pb.go
@@ -55,6 +55,8 @@ It has these top-level messages:
 	LastCommitForPathResponse
 	CommitsByMessageRequest
 	CommitsByMessageResponse
+	FilterShasWithSignaturesRequest
+	FilterShasWithSignaturesResponse
 	CommitDiffRequest
 	CommitDiffResponse
 	CommitDeltaRequest
@@ -89,6 +91,8 @@ It has these top-level messages:
 	OperationBranchUpdate
 	UserFFBranchRequest
 	UserFFBranchResponse
+	UserCherryPickRequest
+	UserCherryPickResponse
 	FindDefaultBranchNameRequest
 	FindDefaultBranchNameResponse
 	FindAllBranchNamesRequest
diff --git a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/commit.pb.go b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/commit.pb.go
index ec8cdafb4..624b9b672 100644
--- a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/commit.pb.go
+++ b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/commit.pb.go
@@ -1063,6 +1063,50 @@ func (m *CommitsByMessageResponse) GetCommits() []*GitCommit {
 	return nil
 }
 
+type FilterShasWithSignaturesRequest struct {
+	Repository *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"`
+	Shas       [][]byte    `protobuf:"bytes,2,rep,name=shas,proto3" json:"shas,omitempty"`
+}
+
+func (m *FilterShasWithSignaturesRequest) Reset()         { *m = FilterShasWithSignaturesRequest{} }
+func (m *FilterShasWithSignaturesRequest) String() string { return proto.CompactTextString(m) }
+func (*FilterShasWithSignaturesRequest) ProtoMessage()    {}
+func (*FilterShasWithSignaturesRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor1, []int{31}
+}
+
+func (m *FilterShasWithSignaturesRequest) GetRepository() *Repository {
+	if m != nil {
+		return m.Repository
+	}
+	return nil
+}
+
+func (m *FilterShasWithSignaturesRequest) GetShas() [][]byte {
+	if m != nil {
+		return m.Shas
+	}
+	return nil
+}
+
+type FilterShasWithSignaturesResponse struct {
+	Shas [][]byte `protobuf:"bytes,1,rep,name=shas,proto3" json:"shas,omitempty"`
+}
+
+func (m *FilterShasWithSignaturesResponse) Reset()         { *m = FilterShasWithSignaturesResponse{} }
+func (m *FilterShasWithSignaturesResponse) String() string { return proto.CompactTextString(m) }
+func (*FilterShasWithSignaturesResponse) ProtoMessage()    {}
+func (*FilterShasWithSignaturesResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor1, []int{32}
+}
+
+func (m *FilterShasWithSignaturesResponse) GetShas() [][]byte {
+	if m != nil {
+		return m.Shas
+	}
+	return nil
+}
+
 func init() {
 	proto.RegisterType((*CommitStatsRequest)(nil), "gitaly.CommitStatsRequest")
 	proto.RegisterType((*CommitStatsResponse)(nil), "gitaly.CommitStatsResponse")
@@ -1096,6 +1140,8 @@ func init() {
 	proto.RegisterType((*LastCommitForPathResponse)(nil), "gitaly.LastCommitForPathResponse")
 	proto.RegisterType((*CommitsByMessageRequest)(nil), "gitaly.CommitsByMessageRequest")
 	proto.RegisterType((*CommitsByMessageResponse)(nil), "gitaly.CommitsByMessageResponse")
+	proto.RegisterType((*FilterShasWithSignaturesRequest)(nil), "gitaly.FilterShasWithSignaturesRequest")
+	proto.RegisterType((*FilterShasWithSignaturesResponse)(nil), "gitaly.FilterShasWithSignaturesResponse")
 	proto.RegisterEnum("gitaly.TreeEntryResponse_ObjectType", TreeEntryResponse_ObjectType_name, TreeEntryResponse_ObjectType_value)
 	proto.RegisterEnum("gitaly.TreeEntry_EntryType", TreeEntry_EntryType_name, TreeEntry_EntryType_value)
 	proto.RegisterEnum("gitaly.FindAllCommitsRequest_Order", FindAllCommitsRequest_Order_name, FindAllCommitsRequest_Order_value)
@@ -1128,6 +1174,7 @@ type CommitServiceClient interface {
 	LastCommitForPath(ctx context.Context, in *LastCommitForPathRequest, opts ...grpc.CallOption) (*LastCommitForPathResponse, error)
 	CommitsByMessage(ctx context.Context, in *CommitsByMessageRequest, opts ...grpc.CallOption) (CommitService_CommitsByMessageClient, error)
 	ListCommitsByOid(ctx context.Context, in *ListCommitsByOidRequest, opts ...grpc.CallOption) (CommitService_ListCommitsByOidClient, error)
+	FilterShasWithSignatures(ctx context.Context, opts ...grpc.CallOption) (CommitService_FilterShasWithSignaturesClient, error)
 }
 
 type commitServiceClient struct {
@@ -1480,6 +1527,37 @@ func (x *commitServiceListCommitsByOidClient) Recv() (*ListCommitsByOidResponse,
 	return m, nil
 }
 
+func (c *commitServiceClient) FilterShasWithSignatures(ctx context.Context, opts ...grpc.CallOption) (CommitService_FilterShasWithSignaturesClient, error) {
+	stream, err := grpc.NewClientStream(ctx, &_CommitService_serviceDesc.Streams[9], c.cc, "/gitaly.CommitService/FilterShasWithSignatures", opts...)
+	if err != nil {
+		return nil, err
+	}
+	x := &commitServiceFilterShasWithSignaturesClient{stream}
+	return x, nil
+}
+
+type CommitService_FilterShasWithSignaturesClient interface {
+	Send(*FilterShasWithSignaturesRequest) error
+	Recv() (*FilterShasWithSignaturesResponse, error)
+	grpc.ClientStream
+}
+
+type commitServiceFilterShasWithSignaturesClient struct {
+	grpc.ClientStream
+}
+
+func (x *commitServiceFilterShasWithSignaturesClient) Send(m *FilterShasWithSignaturesRequest) error {
+	return x.ClientStream.SendMsg(m)
+}
+
+func (x *commitServiceFilterShasWithSignaturesClient) Recv() (*FilterShasWithSignaturesResponse, error) {
+	m := new(FilterShasWithSignaturesResponse)
+	if err := x.ClientStream.RecvMsg(m); err != nil {
+		return nil, err
+	}
+	return m, nil
+}
+
 // Server API for CommitService service
 
 type CommitServiceServer interface {
@@ -1499,6 +1577,7 @@ type CommitServiceServer interface {
 	LastCommitForPath(context.Context, *LastCommitForPathRequest) (*LastCommitForPathResponse, error)
 	CommitsByMessage(*CommitsByMessageRequest, CommitService_CommitsByMessageServer) error
 	ListCommitsByOid(*ListCommitsByOidRequest, CommitService_ListCommitsByOidServer) error
+	FilterShasWithSignatures(CommitService_FilterShasWithSignaturesServer) error
 }
 
 func RegisterCommitServiceServer(s *grpc.Server, srv CommitServiceServer) {
@@ -1802,6 +1881,32 @@ func (x *commitServiceListCommitsByOidServer) Send(m *ListCommitsByOidResponse)
 	return x.ServerStream.SendMsg(m)
 }
 
+func _CommitService_FilterShasWithSignatures_Handler(srv interface{}, stream grpc.ServerStream) error {
+	return srv.(CommitServiceServer).FilterShasWithSignatures(&commitServiceFilterShasWithSignaturesServer{stream})
+}
+
+type CommitService_FilterShasWithSignaturesServer interface {
+	Send(*FilterShasWithSignaturesResponse) error
+	Recv() (*FilterShasWithSignaturesRequest, error)
+	grpc.ServerStream
+}
+
+type commitServiceFilterShasWithSignaturesServer struct {
+	grpc.ServerStream
+}
+
+func (x *commitServiceFilterShasWithSignaturesServer) Send(m *FilterShasWithSignaturesResponse) error {
+	return x.ServerStream.SendMsg(m)
+}
+
+func (x *commitServiceFilterShasWithSignaturesServer) Recv() (*FilterShasWithSignaturesRequest, error) {
+	m := new(FilterShasWithSignaturesRequest)
+	if err := x.ServerStream.RecvMsg(m); err != nil {
+		return nil, err
+	}
+	return m, nil
+}
+
 var _CommitService_serviceDesc = grpc.ServiceDesc{
 	ServiceName: "gitaly.CommitService",
 	HandlerType: (*CommitServiceServer)(nil),
@@ -1877,6 +1982,12 @@ var _CommitService_serviceDesc = grpc.ServiceDesc{
 			Handler:       _CommitService_ListCommitsByOid_Handler,
 			ServerStreams: true,
 		},
+		{
+			StreamName:    "FilterShasWithSignatures",
+			Handler:       _CommitService_FilterShasWithSignatures_Handler,
+			ServerStreams: true,
+			ClientStreams: true,
+		},
 	},
 	Metadata: "commit.proto",
 }
@@ -1884,94 +1995,98 @@ var _CommitService_serviceDesc = grpc.ServiceDesc{
 func init() { proto.RegisterFile("commit.proto", fileDescriptor1) }
 
 var fileDescriptor1 = []byte{
-	// 1411 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0xcd, 0x6e, 0x1b, 0xb7,
-	0x13, 0xf7, 0xea, 0xcb, 0xd2, 0x48, 0x7f, 0x47, 0x66, 0xbe, 0xe4, 0x75, 0x12, 0x3b, 0xfc, 0xb7,
-	0x85, 0x83, 0x14, 0x4a, 0xa0, 0xa2, 0x40, 0x7b, 0x2a, 0xec, 0x44, 0x76, 0x9d, 0xda, 0x51, 0xc0,
-	0x08, 0x08, 0xd2, 0x8b, 0xb0, 0xd6, 0x52, 0xf2, 0x36, 0x2b, 0x51, 0xd9, 0xa5, 0xe2, 0xa8, 0x05,
-	0x7a, 0x2f, 0xd0, 0x57, 0xe9, 0x43, 0xf4, 0xd6, 0x73, 0x5f, 0xa0, 0xf7, 0x3e, 0x42, 0x4e, 0x05,
-	0x3f, 0x76, 0xb9, 0xd2, 0xae, 0xd2, 0x26, 0x81, 0x72, 0x11, 0xc8, 0x21, 0x97, 0xf3, 0x9b, 0xe1,
-	0xcc, 0x6f, 0x86, 0x82, 0x5a, 0x9f, 0x8d, 0x46, 0x1e, 0x6f, 0x4e, 0x02, 0xc6, 0x19, 0x2a, 0x0d,
-	0x3d, 0xee, 0xf8, 0x33, 0xbb, 0x16, 0x9e, 0x3b, 0x01, 0x75, 0x95, 0xd4, 0xde, 0x19, 0x32, 0x36,
-	0xf4, 0xe9, 0x3d, 0x39, 0x3b, 0x9b, 0x0e, 0xee, 0x71, 0x6f, 0x44, 0x43, 0xee, 0x8c, 0x26, 0x6a,
-	0x03, 0x76, 0x01, 0x3d, 0x90, 0xc7, 0x3c, 0xe5, 0x0e, 0x0f, 0x09, 0x7d, 0x39, 0xa5, 0x21, 0x47,
-	0x2d, 0x80, 0x80, 0x4e, 0x58, 0xe8, 0x71, 0x16, 0xcc, 0x1a, 0xd6, 0xae, 0xb5, 0x57, 0x6d, 0xa1,
-	0xa6, 0xd2, 0xd0, 0x24, 0xf1, 0x0a, 0x49, 0xec, 0x42, 0x36, 0x94, 0x03, 0xfa, 0xca, 0x0b, 0x3d,
-	0x36, 0x6e, 0xe4, 0x76, 0xad, 0xbd, 0x1a, 0x89, 0xe7, 0xb8, 0x0f, 0x97, 0xe7, 0xb4, 0x84, 0x13,
-	0x36, 0x0e, 0x29, 0xaa, 0x43, 0x9e, 0x79, 0xae, 0x3c, 0xbf, 0x42, 0xc4, 0x10, 0xdd, 0x80, 0x8a,
-	0xe3, 0xba, 0x1e, 0xf7, 0xd8, 0x38, 0x94, 0xa7, 0x14, 0x89, 0x11, 0x88, 0x55, 0x97, 0xfa, 0x54,
-	0xad, 0xe6, 0xd5, 0x6a, 0x2c, 0xc0, 0xbf, 0x58, 0x70, 0x5d, 0x69, 0x39, 0x0e, 0xf7, 0xc7, 0x7d,
-	0x1a, 0x72, 0x16, 0x7c, 0x88, 0x41, 0x3b, 0x50, 0x75, 0xf4, 0x31, 0x3d, 0xcf, 0x95, 0x68, 0x2a,
-	0x04, 0x22, 0xd1, 0xb1, 0x8b, 0xb6, 0xa0, 0xdc, 0x3f, 0xf7, 0x7c, 0x57, 0xac, 0xe6, 0xe5, 0xea,
-	0xba, 0x9c, 0x1f, 0xbb, 0xf8, 0x3e, 0x34, 0xd2, 0x50, 0xb4, 0xd5, 0x57, 0xa0, 0xf8, 0xca, 0xf1,
-	0xa7, 0x54, 0xc2, 0x28, 0x13, 0x35, 0xc1, 0xbf, 0x5a, 0x50, 0xef, 0x06, 0x94, 0xb6, 0xc7, 0x3c,
-	0x98, 0xad, 0xe8, 0x1e, 0x10, 0x82, 0xc2, 0xc4, 0xe1, 0xe7, 0x12, 0x6d, 0x8d, 0xc8, 0xb1, 0x80,
-	0xe3, 0x7b, 0x23, 0x8f, 0x37, 0x0a, 0xbb, 0xd6, 0x5e, 0x9e, 0xa8, 0x09, 0xfe, 0xd3, 0x82, 0xcd,
-	0x04, 0x1c, 0x0d, 0xfd, 0x2b, 0x28, 0xf0, 0xd9, 0x44, 0x21, 0xdf, 0x68, 0x7d, 0x12, 0x21, 0x49,
-	0x6d, 0x6c, 0x76, 0xce, 0x7e, 0xa0, 0x7d, 0xde, 0x9d, 0x4d, 0x28, 0x91, 0x5f, 0x44, 0x57, 0x9d,
-	0x33, 0x57, 0x8d, 0xa0, 0x10, 0x7a, 0x3f, 0x52, 0x89, 0x25, 0x4f, 0xe4, 0x58, 0xc8, 0x46, 0xcc,
-	0xa5, 0x12, 0x4a, 0x91, 0xc8, 0xb1, 0x90, 0xb9, 0x0e, 0x77, 0x1a, 0x45, 0x85, 0x59, 0x8c, 0xf1,
-	0x97, 0x00, 0x46, 0x03, 0x02, 0x28, 0x3d, 0xe8, 0x9c, 0x9e, 0x1e, 0x77, 0xeb, 0x6b, 0xa8, 0x0c,
-	0x85, 0x83, 0x93, 0xce, 0x41, 0xdd, 0x12, 0xa3, 0x2e, 0x69, 0xb7, 0xeb, 0x39, 0xb4, 0x0e, 0xf9,
-	0xee, 0xfe, 0x51, 0x3d, 0x8f, 0x19, 0x5c, 0x55, 0xb7, 0x12, 0x1e, 0x50, 0x7e, 0x41, 0xe9, 0xf8,
-	0x43, 0xfc, 0x8c, 0xa0, 0x30, 0x08, 0xd8, 0x48, 0xfb, 0x58, 0x8e, 0xd1, 0x06, 0xe4, 0x38, 0xd3,
-	0xde, 0xcd, 0x71, 0x86, 0xdb, 0x70, 0x6d, 0x51, 0xa1, 0xf6, 0xe4, 0x5d, 0x58, 0x57, 0xe9, 0x1b,
-	0x36, 0xac, 0xdd, 0xfc, 0x5e, 0xb5, 0xb5, 0x19, 0xa9, 0x3b, 0xf2, 0xb8, 0xfa, 0x86, 0x44, 0x3b,
-	0xf0, 0x5f, 0x96, 0xc8, 0x9f, 0xe9, 0x58, 0x2f, 0xac, 0x2a, 0x4d, 0xd1, 0x7d, 0x28, 0x3a, 0x03,
-	0x4e, 0x03, 0x69, 0x41, 0xb5, 0x65, 0x37, 0x15, 0x7b, 0x34, 0x23, 0xf6, 0x68, 0x76, 0x23, 0xf6,
-	0x20, 0x6a, 0x23, 0x6a, 0x41, 0xe9, 0x8c, 0x0e, 0x58, 0xa0, 0xae, 0xec, 0xed, 0x9f, 0xe8, 0x9d,
-	0x71, 0x10, 0x16, 0x4d, 0x10, 0xe2, 0xcf, 0xe1, 0xca, 0xbc, 0x81, 0x26, 0x57, 0xfa, 0x42, 0x2e,
-	0x8d, 0x2b, 0x12, 0x35, 0xc1, 0x6f, 0x2c, 0xa8, 0xc4, 0x31, 0x97, 0xc1, 0x22, 0x5b, 0x50, 0x0e,
-	0x18, 0xe3, 0x3d, 0x13, 0x71, 0xeb, 0x62, 0xde, 0x51, 0x51, 0x97, 0xca, 0x80, 0x7b, 0x3a, 0xaa,
-	0x0b, 0x32, 0xaa, 0xb7, 0x53, 0x51, 0xdd, 0x94, 0xbf, 0x89, 0x60, 0x8e, 0xc2, 0xb4, 0x98, 0x08,
-	0xd3, 0x9b, 0x00, 0xea, 0xba, 0xa4, 0xd6, 0x92, 0xd4, 0x5a, 0x51, 0x12, 0xa1, 0x77, 0x1b, 0x2a,
-	0x03, 0xdf, 0xe1, 0x3d, 0xa9, 0x7c, 0x5d, 0xf9, 0x5d, 0x08, 0x9e, 0x08, 0xeb, 0xef, 0x42, 0x25,
-	0x56, 0x11, 0x47, 0xf0, 0x5a, 0x1c, 0xc1, 0x56, 0x22, 0xc2, 0xf3, 0xf8, 0x27, 0xb8, 0x7a, 0x44,
-	0x79, 0x04, 0xce, 0xa3, 0xe1, 0x47, 0x24, 0x0b, 0x11, 0xd0, 0x8b, 0xca, 0x4d, 0x40, 0x53, 0x25,
-	0x5a, 0x0c, 0x68, 0xc3, 0x0e, 0xd1, 0x0e, 0x7c, 0x06, 0xf5, 0x13, 0x2f, 0xe4, 0x87, 0x9e, 0xbf,
-	0x32, 0xf8, 0xf8, 0x0e, 0x6c, 0x26, 0x74, 0x98, 0x78, 0x12, 0x76, 0x28, 0x8c, 0x35, 0xa2, 0x26,
-	0xb8, 0x0f, 0x9b, 0x87, 0xde, 0xd8, 0xd5, 0x69, 0xb7, 0x22, 0x3c, 0xdf, 0x00, 0x4a, 0x2a, 0xd1,
-	0x80, 0xee, 0x40, 0x49, 0x05, 0x89, 0xd6, 0x90, 0x41, 0x03, 0x7a, 0x03, 0xee, 0xc1, 0x75, 0x61,
-	0x50, 0x44, 0x28, 0xb3, 0x8e, 0xe7, 0x7e, 0x08, 0xd6, 0x98, 0x91, 0xf3, 0x3a, 0x6d, 0x70, 0x1b,
-	0x1a, 0x69, 0x05, 0xef, 0x8e, 0xf3, 0x8d, 0x05, 0x57, 0x85, 0xa5, 0xfb, 0xbe, 0xbf, 0x62, 0xbe,
-	0xda, 0x86, 0xca, 0xc8, 0x79, 0xdd, 0x53, 0x0c, 0xa1, 0xfa, 0x81, 0xf2, 0xc8, 0x79, 0x2d, 0x99,
-	0x44, 0xd6, 0x97, 0x17, 0xde, 0x24, 0xaa, 0x25, 0x62, 0x8c, 0xbe, 0x86, 0x22, 0x0b, 0x5c, 0x1a,
-	0xc8, 0xcc, 0xdd, 0x68, 0xfd, 0x3f, 0xd2, 0x9d, 0x09, 0xb7, 0xd9, 0x11, 0x5b, 0x89, 0xfa, 0x02,
-	0x7f, 0x0a, 0x45, 0x39, 0x17, 0x59, 0xf9, 0xb8, 0xf3, 0xb8, 0xad, 0xf3, 0xb3, 0xf3, 0xa4, 0xa3,
-	0x6a, 0xcd, 0xc3, 0xfd, 0x6e, 0xbb, 0x9e, 0x13, 0x09, 0xb2, 0x78, 0xd8, 0xfb, 0x30, 0xfe, 0xdf,
-	0xb9, 0x64, 0xb4, 0xac, 0xcc, 0x81, 0x71, 0xed, 0x57, 0xce, 0x53, 0x13, 0x74, 0x0d, 0x4a, 0x6c,
-	0x30, 0x08, 0x29, 0xd7, 0xbe, 0xd3, 0x33, 0x93, 0x3c, 0xc5, 0x44, 0xf2, 0x88, 0xdd, 0x03, 0xe6,
-	0xfb, 0xec, 0x42, 0x92, 0x5e, 0x99, 0xe8, 0x99, 0x68, 0x9f, 0x84, 0xcf, 0x7b, 0x23, 0x1a, 0x0c,
-	0x69, 0x28, 0x39, 0xaf, 0x4c, 0x40, 0x88, 0x4e, 0xa5, 0x04, 0xdd, 0x86, 0x9a, 0xeb, 0x85, 0xce,
-	0x99, 0x4f, 0x7b, 0x17, 0x8e, 0xff, 0xa2, 0x51, 0x96, 0x3b, 0xaa, 0x5a, 0xf6, 0xcc, 0xf1, 0x5f,
-	0x98, 0x82, 0x54, 0x79, 0xf7, 0x82, 0x04, 0xff, 0xb5, 0x20, 0xe1, 0x03, 0xb8, 0x3c, 0xe7, 0xeb,
-	0xf7, 0xb9, 0xb0, 0xf3, 0xa8, 0xd2, 0x9f, 0x38, 0xe3, 0xe1, 0xd4, 0x19, 0xae, 0x8e, 0xd7, 0x7e,
-	0x8b, 0xdb, 0xdc, 0x84, 0x2a, 0x0d, 0xf9, 0x10, 0x2a, 0x7e, 0x24, 0xd4, 0xa0, 0xf7, 0x22, 0x55,
-	0x4b, 0xbe, 0x69, 0x46, 0x12, 0x62, 0x3e, 0xb5, 0x1f, 0x41, 0x39, 0x12, 0x8b, 0x3c, 0x1a, 0x3b,
-	0x23, 0xaa, 0xeb, 0xab, 0x1c, 0x8b, 0x48, 0x90, 0xcf, 0x0c, 0x09, 0x2e, 0x47, 0xd4, 0x44, 0x15,
-	0x6b, 0x9f, 0x05, 0xba, 0x19, 0x56, 0x13, 0x3c, 0x85, 0x4b, 0xc4, 0xb9, 0x38, 0xf0, 0x9d, 0x11,
-	0xfd, 0x98, 0x95, 0xea, 0x33, 0xa8, 0x1b, 0xb5, 0xda, 0x3d, 0x51, 0x2b, 0x69, 0x25, 0x5a, 0xc9,
-	0x9f, 0xa1, 0x71, 0xe2, 0x44, 0xa4, 0x77, 0xc8, 0x02, 0x51, 0x90, 0x3f, 0x26, 0xce, 0x43, 0xd8,
-	0xca, 0xd0, 0xff, 0xee, 0xac, 0xfb, 0x7b, 0x1c, 0x16, 0xe1, 0xc1, 0xec, 0x94, 0x86, 0xa1, 0xb8,
-	0xd2, 0x15, 0xd9, 0x61, 0x08, 0x22, 0xbf, 0x48, 0x10, 0xe6, 0x29, 0x11, 0xd3, 0x49, 0x46, 0xbf,
-	0x27, 0x76, 0xbe, 0x9c, 0xd2, 0x60, 0xa6, 0x1b, 0x25, 0x35, 0xc1, 0x47, 0xd1, 0xab, 0x29, 0x69,
-	0xc2, 0x7b, 0x64, 0x63, 0xeb, 0x8f, 0x0a, 0xfc, 0x4f, 0x3f, 0x38, 0x69, 0xf0, 0xca, 0xeb, 0x53,
-	0xf4, 0x0c, 0xea, 0x8b, 0x0f, 0x32, 0xb4, 0x33, 0x9f, 0x1a, 0xa9, 0x57, 0xa3, 0xbd, 0xbb, 0x7c,
-	0x83, 0x42, 0x85, 0xd7, 0xd0, 0xc3, 0x64, 0x2b, 0xda, 0xc8, 0x78, 0x11, 0xa9, 0xa3, 0xb6, 0x96,
-	0xbe, 0x95, 0xf0, 0xda, 0x7d, 0x0b, 0x3d, 0x85, 0x8d, 0xf9, 0x87, 0x02, 0xba, 0x39, 0xaf, 0x7b,
-	0xe1, 0xc5, 0x62, 0xdf, 0x5a, 0xb6, 0x9c, 0x38, 0xf4, 0x3b, 0xa8, 0x25, 0x9b, 0x6a, 0xb4, 0x6d,
-	0xbe, 0x49, 0xbd, 0x25, 0xec, 0x1b, 0xd9, 0x8b, 0xb1, 0x9d, 0x4f, 0x61, 0x63, 0xbe, 0xf3, 0x33,
-	0x08, 0x33, 0xdb, 0x51, 0x83, 0x30, 0xbb, 0x61, 0x94, 0x08, 0x1f, 0x42, 0x25, 0xee, 0xd1, 0x8c,
-	0xf3, 0x16, 0x5b, 0x43, 0xe3, 0xbc, 0x54, 0x43, 0x27, 0x4f, 0x69, 0x03, 0x18, 0xfe, 0x46, 0x5b,
-	0xc9, 0xa2, 0x3e, 0xd7, 0xd2, 0xd9, 0x76, 0xd6, 0x52, 0x6c, 0xe1, 0xb7, 0x50, 0x4d, 0xfc, 0x49,
-	0x81, 0xec, 0x79, 0x0f, 0x27, 0xff, 0x1f, 0xb1, 0xb7, 0x33, 0xd7, 0x92, 0xbe, 0x9a, 0x6f, 0x02,
-	0x8c, 0xaf, 0x32, 0x3b, 0x0d, 0xe3, 0xab, 0xec, 0xde, 0x41, 0x5a, 0xf9, 0x08, 0xaa, 0x89, 0x2a,
-	0x85, 0x32, 0x6c, 0x49, 0xc3, 0xcb, 0x28, 0x6b, 0xf2, 0xac, 0x2e, 0x5c, 0x5a, 0x28, 0x07, 0xe8,
-	0xd6, 0xd2, 0x3a, 0xa1, 0xce, 0xdc, 0xf9, 0x97, 0x3a, 0x82, 0xd7, 0xd0, 0x3e, 0x94, 0x23, 0xca,
-	0x45, 0xd7, 0x63, 0x7a, 0x99, 0xe7, 0x7e, 0xbb, 0x91, 0x5e, 0x48, 0x00, 0xfb, 0x1e, 0x36, 0x53,
-	0x6c, 0x88, 0xe2, 0x34, 0x5c, 0x46, 0xd4, 0xf6, 0xed, 0xb7, 0xec, 0x88, 0xe1, 0x3d, 0x8f, 0x28,
-	0xc0, 0xb0, 0xcb, 0x22, 0x05, 0xa4, 0xa8, 0x73, 0x91, 0x02, 0xd2, 0xc4, 0x24, 0x61, 0x3f, 0x57,
-	0xef, 0x99, 0x64, 0xe7, 0x6c, 0x8e, 0x5e, 0xd2, 0xb4, 0x9b, 0xa3, 0x97, 0x35, 0xdd, 0xe2, 0xe8,
-	0xb3, 0x92, 0x6c, 0x5c, 0xbe, 0xf8, 0x27, 0x00, 0x00, 0xff, 0xff, 0xe2, 0x0d, 0x89, 0x09, 0xee,
-	0x13, 0x00, 0x00,
+	// 1480 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0xdd, 0x6e, 0xdb, 0xc6,
+	0x12, 0x36, 0xf5, 0x67, 0x69, 0xa4, 0xe3, 0xc8, 0x9b, 0x3f, 0x99, 0x4e, 0x62, 0x87, 0xe7, 0x9c,
+	0x56, 0x41, 0x0a, 0xc5, 0x50, 0xd1, 0xa2, 0xbd, 0x2a, 0xec, 0x44, 0x76, 0x9d, 0xda, 0x51, 0x40,
+	0x0b, 0x08, 0xd2, 0x1b, 0x81, 0x16, 0x57, 0xd2, 0x36, 0x94, 0x56, 0x21, 0x57, 0x71, 0xd4, 0x02,
+	0xbd, 0x2f, 0xd0, 0x57, 0xe9, 0x23, 0xf4, 0xa2, 0xaf, 0xd0, 0x17, 0xe8, 0x7d, 0x1f, 0x21, 0x57,
+	0xc5, 0xfe, 0x90, 0x4b, 0x89, 0x54, 0xd2, 0xc4, 0x50, 0x6e, 0x84, 0xdd, 0xd9, 0xe5, 0xce, 0x37,
+	0xb3, 0x33, 0xdf, 0xcc, 0x0a, 0x2a, 0x3d, 0x3a, 0x1a, 0x11, 0xd6, 0x98, 0xf8, 0x94, 0x51, 0x54,
+	0x18, 0x10, 0xe6, 0x78, 0x33, 0xb3, 0x12, 0x0c, 0x1d, 0x1f, 0xbb, 0x52, 0x6a, 0xee, 0x0c, 0x28,
+	0x1d, 0x78, 0xf8, 0x81, 0x98, 0x9d, 0x4f, 0xfb, 0x0f, 0x18, 0x19, 0xe1, 0x80, 0x39, 0xa3, 0x89,
+	0xdc, 0x60, 0xb9, 0x80, 0x1e, 0x8a, 0x63, 0xce, 0x98, 0xc3, 0x02, 0x1b, 0xbf, 0x9c, 0xe2, 0x80,
+	0xa1, 0x26, 0x80, 0x8f, 0x27, 0x34, 0x20, 0x8c, 0xfa, 0xb3, 0x9a, 0xb1, 0x6b, 0xd4, 0xcb, 0x4d,
+	0xd4, 0x90, 0x1a, 0x1a, 0x76, 0xb4, 0x62, 0xc7, 0x76, 0x21, 0x13, 0x8a, 0x3e, 0x7e, 0x45, 0x02,
+	0x42, 0xc7, 0xb5, 0xcc, 0xae, 0x51, 0xaf, 0xd8, 0xd1, 0xdc, 0xea, 0xc1, 0xd5, 0x39, 0x2d, 0xc1,
+	0x84, 0x8e, 0x03, 0x8c, 0xaa, 0x90, 0xa5, 0xc4, 0x15, 0xe7, 0x97, 0x6c, 0x3e, 0x44, 0xb7, 0xa0,
+	0xe4, 0xb8, 0x2e, 0x61, 0x84, 0x8e, 0x03, 0x71, 0x4a, 0xde, 0xd6, 0x02, 0xbe, 0xea, 0x62, 0x0f,
+	0xcb, 0xd5, 0xac, 0x5c, 0x8d, 0x04, 0xd6, 0x2f, 0x06, 0xdc, 0x94, 0x5a, 0x8e, 0x83, 0xfd, 0x71,
+	0x0f, 0x07, 0x8c, 0xfa, 0x97, 0x31, 0x68, 0x07, 0xca, 0x8e, 0x3a, 0xa6, 0x4b, 0x5c, 0x81, 0xa6,
+	0x64, 0x43, 0x28, 0x3a, 0x76, 0xd1, 0x16, 0x14, 0x7b, 0x43, 0xe2, 0xb9, 0x7c, 0x35, 0x2b, 0x56,
+	0xd7, 0xc5, 0xfc, 0xd8, 0xb5, 0xf6, 0xa0, 0x96, 0x84, 0xa2, 0xac, 0xbe, 0x06, 0xf9, 0x57, 0x8e,
+	0x37, 0xc5, 0x02, 0x46, 0xd1, 0x96, 0x13, 0xeb, 0x57, 0x03, 0xaa, 0x1d, 0x1f, 0xe3, 0xd6, 0x98,
+	0xf9, 0xb3, 0x15, 0xdd, 0x03, 0x42, 0x90, 0x9b, 0x38, 0x6c, 0x28, 0xd0, 0x56, 0x6c, 0x31, 0xe6,
+	0x70, 0x3c, 0x32, 0x22, 0xac, 0x96, 0xdb, 0x35, 0xea, 0x59, 0x5b, 0x4e, 0xac, 0x3f, 0x0d, 0xd8,
+	0x8c, 0xc1, 0x51, 0xd0, 0xbf, 0x82, 0x1c, 0x9b, 0x4d, 0x24, 0xf2, 0x8d, 0xe6, 0xff, 0x42, 0x24,
+	0x89, 0x8d, 0x8d, 0xf6, 0xf9, 0x0f, 0xb8, 0xc7, 0x3a, 0xb3, 0x09, 0xb6, 0xc5, 0x17, 0xe1, 0x55,
+	0x67, 0xf4, 0x55, 0x23, 0xc8, 0x05, 0xe4, 0x47, 0x2c, 0xb0, 0x64, 0x6d, 0x31, 0xe6, 0xb2, 0x11,
+	0x75, 0xb1, 0x80, 0x92, 0xb7, 0xc5, 0x98, 0xcb, 0x5c, 0x87, 0x39, 0xb5, 0xbc, 0xc4, 0xcc, 0xc7,
+	0xd6, 0x17, 0x00, 0x5a, 0x03, 0x02, 0x28, 0x3c, 0x6c, 0x9f, 0x9e, 0x1e, 0x77, 0xaa, 0x6b, 0xa8,
+	0x08, 0xb9, 0x83, 0x93, 0xf6, 0x41, 0xd5, 0xe0, 0xa3, 0x8e, 0xdd, 0x6a, 0x55, 0x33, 0x68, 0x1d,
+	0xb2, 0x9d, 0xfd, 0xa3, 0x6a, 0xd6, 0xa2, 0x70, 0x5d, 0xde, 0x4a, 0x70, 0x80, 0xd9, 0x05, 0xc6,
+	0xe3, 0xcb, 0xf8, 0x19, 0x41, 0xae, 0xef, 0xd3, 0x91, 0xf2, 0xb1, 0x18, 0xa3, 0x0d, 0xc8, 0x30,
+	0xaa, 0xbc, 0x9b, 0x61, 0xd4, 0x6a, 0xc1, 0x8d, 0x45, 0x85, 0xca, 0x93, 0xf7, 0x61, 0x5d, 0xa6,
+	0x6f, 0x50, 0x33, 0x76, 0xb3, 0xf5, 0x72, 0x73, 0x33, 0x54, 0x77, 0x44, 0x98, 0xfc, 0xc6, 0x0e,
+	0x77, 0x58, 0x7f, 0x19, 0x3c, 0x7f, 0xa6, 0x63, 0xb5, 0xb0, 0xaa, 0x34, 0x45, 0x7b, 0x90, 0x77,
+	0xfa, 0x0c, 0xfb, 0xc2, 0x82, 0x72, 0xd3, 0x6c, 0x48, 0xf6, 0x68, 0x84, 0xec, 0xd1, 0xe8, 0x84,
+	0xec, 0x61, 0xcb, 0x8d, 0xa8, 0x09, 0x85, 0x73, 0xdc, 0xa7, 0xbe, 0xbc, 0xb2, 0xb7, 0x7f, 0xa2,
+	0x76, 0x46, 0x41, 0x98, 0xd7, 0x41, 0x68, 0x7d, 0x06, 0xd7, 0xe6, 0x0d, 0xd4, 0xb9, 0xd2, 0xe3,
+	0x72, 0x61, 0x5c, 0xde, 0x96, 0x13, 0xeb, 0x8d, 0x01, 0xa5, 0x28, 0xe6, 0x52, 0x58, 0x64, 0x0b,
+	0x8a, 0x3e, 0xa5, 0xac, 0xab, 0x23, 0x6e, 0x9d, 0xcf, 0xdb, 0x32, 0xea, 0x12, 0x19, 0xf0, 0x40,
+	0x45, 0x75, 0x4e, 0x44, 0xf5, 0x76, 0x22, 0xaa, 0x1b, 0xe2, 0x37, 0x16, 0xcc, 0x61, 0x98, 0xe6,
+	0x63, 0x61, 0x7a, 0x1b, 0x40, 0x5e, 0x97, 0xd0, 0x5a, 0x10, 0x5a, 0x4b, 0x52, 0xc2, 0xf5, 0x6e,
+	0x43, 0xa9, 0xef, 0x39, 0xac, 0x2b, 0x94, 0xaf, 0x4b, 0xbf, 0x73, 0xc1, 0x53, 0x6e, 0xfd, 0x7d,
+	0x28, 0x45, 0x2a, 0xa2, 0x08, 0x5e, 0x8b, 0x22, 0xd8, 0x88, 0x45, 0x78, 0xd6, 0xfa, 0x09, 0xae,
+	0x1f, 0x61, 0x16, 0x82, 0x23, 0x38, 0xf8, 0x88, 0x64, 0xc1, 0x03, 0x7a, 0x51, 0xb9, 0x0e, 0x68,
+	0x2c, 0x45, 0x8b, 0x01, 0xad, 0xd9, 0x21, 0xdc, 0x61, 0x9d, 0x43, 0xf5, 0x84, 0x04, 0xec, 0x90,
+	0x78, 0x2b, 0x83, 0x6f, 0xdd, 0x83, 0xcd, 0x98, 0x0e, 0x1d, 0x4f, 0xdc, 0x0e, 0x89, 0xb1, 0x62,
+	0xcb, 0x89, 0xd5, 0x83, 0xcd, 0x43, 0x32, 0x76, 0x55, 0xda, 0xad, 0x08, 0xcf, 0x37, 0x80, 0xe2,
+	0x4a, 0x14, 0xa0, 0x7b, 0x50, 0x90, 0x41, 0xa2, 0x34, 0xa4, 0xd0, 0x80, 0xda, 0x60, 0x75, 0xe1,
+	0x26, 0x37, 0x28, 0x24, 0x94, 0x59, 0x9b, 0xb8, 0x97, 0xc1, 0x1a, 0x31, 0x72, 0x56, 0xa5, 0x8d,
+	0xd5, 0x82, 0x5a, 0x52, 0xc1, 0xfb, 0xe3, 0x7c, 0x63, 0xc0, 0x75, 0x6e, 0xe9, 0xbe, 0xe7, 0xad,
+	0x98, 0xaf, 0xb6, 0xa1, 0x34, 0x72, 0x5e, 0x77, 0x25, 0x43, 0xc8, 0x7e, 0xa0, 0x38, 0x72, 0x5e,
+	0x0b, 0x26, 0x11, 0xf5, 0xe5, 0x05, 0x99, 0x84, 0xb5, 0x84, 0x8f, 0xd1, 0xd7, 0x90, 0xa7, 0xbe,
+	0x8b, 0x7d, 0x91, 0xb9, 0x1b, 0xcd, 0xff, 0x86, 0xba, 0x53, 0xe1, 0x36, 0xda, 0x7c, 0xab, 0x2d,
+	0xbf, 0xb0, 0xfe, 0x0f, 0x79, 0x31, 0xe7, 0x59, 0xf9, 0xa4, 0xfd, 0xa4, 0xa5, 0xf2, 0xb3, 0xfd,
+	0xb4, 0x2d, 0x6b, 0xcd, 0xa3, 0xfd, 0x4e, 0xab, 0x9a, 0xe1, 0x09, 0xb2, 0x78, 0xd8, 0x87, 0x30,
+	0xfe, 0xdf, 0x99, 0x78, 0xb4, 0xac, 0xcc, 0x81, 0x51, 0xed, 0x97, 0xce, 0x93, 0x13, 0x74, 0x03,
+	0x0a, 0xb4, 0xdf, 0x0f, 0x30, 0x53, 0xbe, 0x53, 0x33, 0x9d, 0x3c, 0xf9, 0x58, 0xf2, 0xf0, 0xdd,
+	0x7d, 0xea, 0x79, 0xf4, 0x42, 0x90, 0x5e, 0xd1, 0x56, 0x33, 0xde, 0x3e, 0x71, 0x9f, 0x77, 0x47,
+	0xd8, 0x1f, 0xe0, 0x40, 0x70, 0x5e, 0xd1, 0x06, 0x2e, 0x3a, 0x15, 0x12, 0x74, 0x17, 0x2a, 0x2e,
+	0x09, 0x9c, 0x73, 0x0f, 0x77, 0x2f, 0x1c, 0xef, 0x45, 0xad, 0x28, 0x76, 0x94, 0x95, 0xec, 0x99,
+	0xe3, 0xbd, 0xd0, 0x05, 0xa9, 0xf4, 0xfe, 0x05, 0x09, 0xfe, 0x6d, 0x41, 0xb2, 0x0e, 0xe0, 0xea,
+	0x9c, 0xaf, 0x3f, 0xe4, 0xc2, 0x86, 0x61, 0xa5, 0x3f, 0x71, 0xc6, 0x83, 0xa9, 0x33, 0x58, 0x1d,
+	0xaf, 0xfd, 0x16, 0xb5, 0xb9, 0x31, 0x55, 0x0a, 0xf2, 0x21, 0x94, 0xbc, 0x50, 0xa8, 0x40, 0xd7,
+	0x43, 0x55, 0x4b, 0xbe, 0x69, 0x84, 0x12, 0x5b, 0x7f, 0x6a, 0x3e, 0x86, 0x62, 0x28, 0xe6, 0x79,
+	0x34, 0x76, 0x46, 0x58, 0xd5, 0x57, 0x31, 0xe6, 0x91, 0x20, 0x9e, 0x19, 0x02, 0x5c, 0xc6, 0x96,
+	0x13, 0x59, 0xac, 0x3d, 0xea, 0xab, 0x66, 0x58, 0x4e, 0xac, 0x29, 0x5c, 0xb1, 0x9d, 0x8b, 0x03,
+	0xcf, 0x19, 0xe1, 0x8f, 0x59, 0xa9, 0x3e, 0x81, 0xaa, 0x56, 0xab, 0xdc, 0x13, 0xb6, 0x92, 0x46,
+	0xac, 0x95, 0xfc, 0x19, 0x6a, 0x27, 0x4e, 0x48, 0x7a, 0x87, 0xd4, 0xe7, 0x05, 0xf9, 0x63, 0xe2,
+	0x3c, 0x84, 0xad, 0x14, 0xfd, 0xef, 0xcf, 0xba, 0x7f, 0x44, 0x61, 0x11, 0x1c, 0xcc, 0x4e, 0x71,
+	0x10, 0xf0, 0x2b, 0x5d, 0x91, 0x1d, 0x9a, 0x20, 0xb2, 0x8b, 0x04, 0xa1, 0x9f, 0x12, 0x11, 0x9d,
+	0xa4, 0xf4, 0x7b, 0x7c, 0xe7, 0xcb, 0x29, 0xf6, 0x67, 0xaa, 0x51, 0x92, 0x13, 0xeb, 0x28, 0x7c,
+	0x35, 0xc5, 0x4d, 0xf8, 0x90, 0x6c, 0x24, 0xb0, 0x73, 0x48, 0x3c, 0x86, 0xfd, 0xb3, 0xa1, 0x13,
+	0x3c, 0x23, 0x6c, 0x78, 0x46, 0x06, 0x63, 0x87, 0x4d, 0xfd, 0xcb, 0xa5, 0x25, 0x2f, 0x29, 0x43,
+	0x27, 0x10, 0x35, 0xb3, 0x62, 0x8b, 0xb1, 0xf5, 0x25, 0xec, 0x2e, 0x57, 0xa5, 0xe3, 0x4e, 0x7c,
+	0x67, 0xe8, 0xef, 0x9a, 0xbf, 0x03, 0xfc, 0x47, 0xbd, 0x89, 0xb1, 0xff, 0x8a, 0xf4, 0x30, 0x7a,
+	0x06, 0xd5, 0xc5, 0x37, 0x23, 0xda, 0x99, 0xcf, 0xde, 0xc4, 0xc3, 0xd6, 0xdc, 0x5d, 0xbe, 0x41,
+	0x2a, 0xb7, 0xd6, 0xd0, 0xa3, 0x78, 0xb7, 0x5c, 0x4b, 0x79, 0xb4, 0xc9, 0xa3, 0xb6, 0x96, 0x3e,
+	0xe7, 0xac, 0xb5, 0x3d, 0x03, 0x9d, 0xc1, 0xc6, 0xfc, 0x5b, 0x06, 0xdd, 0x9e, 0xd7, 0xbd, 0xf0,
+	0xa8, 0x32, 0xef, 0x2c, 0x5b, 0x8e, 0x1d, 0xfa, 0x1d, 0x54, 0xe2, 0x7d, 0x3f, 0xda, 0xd6, 0xdf,
+	0x24, 0x9e, 0x3b, 0xe6, 0xad, 0xf4, 0xc5, 0xc8, 0xce, 0x33, 0xd8, 0x98, 0x6f, 0x4e, 0x35, 0xc2,
+	0xd4, 0x8e, 0x59, 0x23, 0x4c, 0xef, 0x69, 0x05, 0xc2, 0x47, 0x50, 0x8a, 0xda, 0x48, 0xed, 0xbc,
+	0xc5, 0xee, 0x55, 0x3b, 0x2f, 0xd1, 0x73, 0x8a, 0x53, 0x5a, 0x00, 0xba, 0xc4, 0xa0, 0xad, 0x78,
+	0xdf, 0x31, 0xd7, 0x75, 0x9a, 0x66, 0xda, 0x52, 0x64, 0xe1, 0xb7, 0x50, 0x8e, 0xfd, 0x8f, 0x82,
+	0xcc, 0x79, 0x0f, 0xc7, 0xff, 0xc2, 0x31, 0xb7, 0x53, 0xd7, 0xe2, 0xbe, 0x9a, 0xef, 0x53, 0xb4,
+	0xaf, 0x52, 0x9b, 0x21, 0xed, 0xab, 0xf4, 0xf6, 0x46, 0x58, 0xf9, 0x18, 0xca, 0xb1, 0x42, 0x8a,
+	0x52, 0x6c, 0x49, 0xc2, 0x4b, 0xa9, 0xbc, 0xe2, 0xac, 0x0e, 0x5c, 0x59, 0xa8, 0x58, 0xe8, 0xce,
+	0xd2, 0x52, 0x26, 0xcf, 0xdc, 0x79, 0x47, 0xa9, 0xb3, 0xd6, 0xd0, 0x3e, 0x14, 0xc3, 0xaa, 0x80,
+	0x6e, 0x46, 0xd9, 0x3e, 0x5f, 0x9e, 0xcc, 0x5a, 0x72, 0x21, 0x06, 0xec, 0x7b, 0xd8, 0x4c, 0x10,
+	0x36, 0x8a, 0xd2, 0x70, 0x59, 0x2d, 0x31, 0xef, 0xbe, 0x65, 0x47, 0x04, 0xef, 0x79, 0x48, 0x01,
+	0x9a, 0x00, 0x17, 0x29, 0x20, 0xc1, 0xee, 0x8b, 0x14, 0x90, 0xe4, 0x4e, 0x01, 0xfb, 0xb9, 0x7c,
+	0x72, 0xc5, 0x9b, 0x7b, 0x7d, 0xf4, 0x92, 0x77, 0x85, 0x3e, 0x7a, 0xd9, 0xbb, 0x40, 0x1c, 0x1d,
+	0x40, 0x6d, 0x19, 0x05, 0xa2, 0x4f, 0xf5, 0x3d, 0xbf, 0x95, 0x8f, 0xcd, 0xfa, 0xbb, 0x37, 0x86,
+	0x2a, 0xeb, 0xc6, 0x9e, 0x71, 0x5e, 0x10, 0x0d, 0xdd, 0xe7, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff,
+	0x1a, 0x16, 0x6a, 0x21, 0x06, 0x15, 0x00, 0x00,
 }
diff --git a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/operations.pb.go b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/operations.pb.go
index 7285e68cc..66bc2526f 100644
--- a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/operations.pb.go
+++ b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/operations.pb.go
@@ -445,6 +445,110 @@ func (m *UserFFBranchResponse) GetPreReceiveError() string {
 	return ""
 }
 
+type UserCherryPickRequest struct {
+	Repository      *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"`
+	User            *User       `protobuf:"bytes,2,opt,name=user" json:"user,omitempty"`
+	Commit          *GitCommit  `protobuf:"bytes,3,opt,name=commit" json:"commit,omitempty"`
+	BranchName      []byte      `protobuf:"bytes,4,opt,name=branch_name,json=branchName,proto3" json:"branch_name,omitempty"`
+	Message         []byte      `protobuf:"bytes,5,opt,name=message,proto3" json:"message,omitempty"`
+	StartBranchName []byte      `protobuf:"bytes,6,opt,name=start_branch_name,json=startBranchName,proto3" json:"start_branch_name,omitempty"`
+	StartRepository *Repository `protobuf:"bytes,7,opt,name=start_repository,json=startRepository" json:"start_repository,omitempty"`
+}
+
+func (m *UserCherryPickRequest) Reset()                    { *m = UserCherryPickRequest{} }
+func (m *UserCherryPickRequest) String() string            { return proto.CompactTextString(m) }
+func (*UserCherryPickRequest) ProtoMessage()               {}
+func (*UserCherryPickRequest) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{13} }
+
+func (m *UserCherryPickRequest) GetRepository() *Repository {
+	if m != nil {
+		return m.Repository
+	}
+	return nil
+}
+
+func (m *UserCherryPickRequest) GetUser() *User {
+	if m != nil {
+		return m.User
+	}
+	return nil
+}
+
+func (m *UserCherryPickRequest) GetCommit() *GitCommit {
+	if m != nil {
+		return m.Commit
+	}
+	return nil
+}
+
+func (m *UserCherryPickRequest) GetBranchName() []byte {
+	if m != nil {
+		return m.BranchName
+	}
+	return nil
+}
+
+func (m *UserCherryPickRequest) GetMessage() []byte {
+	if m != nil {
+		return m.Message
+	}
+	return nil
+}
+
+func (m *UserCherryPickRequest) GetStartBranchName() []byte {
+	if m != nil {
+		return m.StartBranchName
+	}
+	return nil
+}
+
+func (m *UserCherryPickRequest) GetStartRepository() *Repository {
+	if m != nil {
+		return m.StartRepository
+	}
+	return nil
+}
+
+type UserCherryPickResponse struct {
+	BranchUpdate    *OperationBranchUpdate `protobuf:"bytes,1,opt,name=branch_update,json=branchUpdate" json:"branch_update,omitempty"`
+	CreateTreeError bool                   `protobuf:"varint,2,opt,name=create_tree_error,json=createTreeError" json:"create_tree_error,omitempty"`
+	CommitError     string                 `protobuf:"bytes,3,opt,name=commit_error,json=commitError" json:"commit_error,omitempty"`
+	PreReceiveError string                 `protobuf:"bytes,4,opt,name=pre_receive_error,json=preReceiveError" json:"pre_receive_error,omitempty"`
+}
+
+func (m *UserCherryPickResponse) Reset()                    { *m = UserCherryPickResponse{} }
+func (m *UserCherryPickResponse) String() string            { return proto.CompactTextString(m) }
+func (*UserCherryPickResponse) ProtoMessage()               {}
+func (*UserCherryPickResponse) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{14} }
+
+func (m *UserCherryPickResponse) GetBranchUpdate() *OperationBranchUpdate {
+	if m != nil {
+		return m.BranchUpdate
+	}
+	return nil
+}
+
+func (m *UserCherryPickResponse) GetCreateTreeError() bool {
+	if m != nil {
+		return m.CreateTreeError
+	}
+	return false
+}
+
+func (m *UserCherryPickResponse) GetCommitError() string {
+	if m != nil {
+		return m.CommitError
+	}
+	return ""
+}
+
+func (m *UserCherryPickResponse) GetPreReceiveError() string {
+	if m != nil {
+		return m.PreReceiveError
+	}
+	return ""
+}
+
 func init() {
 	proto.RegisterType((*UserCreateBranchRequest)(nil), "gitaly.UserCreateBranchRequest")
 	proto.RegisterType((*UserCreateBranchResponse)(nil), "gitaly.UserCreateBranchResponse")
@@ -459,6 +563,8 @@ func init() {
 	proto.RegisterType((*OperationBranchUpdate)(nil), "gitaly.OperationBranchUpdate")
 	proto.RegisterType((*UserFFBranchRequest)(nil), "gitaly.UserFFBranchRequest")
 	proto.RegisterType((*UserFFBranchResponse)(nil), "gitaly.UserFFBranchResponse")
+	proto.RegisterType((*UserCherryPickRequest)(nil), "gitaly.UserCherryPickRequest")
+	proto.RegisterType((*UserCherryPickResponse)(nil), "gitaly.UserCherryPickResponse")
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -478,6 +584,7 @@ type OperationServiceClient interface {
 	UserDeleteTag(ctx context.Context, in *UserDeleteTagRequest, opts ...grpc.CallOption) (*UserDeleteTagResponse, error)
 	UserMergeBranch(ctx context.Context, opts ...grpc.CallOption) (OperationService_UserMergeBranchClient, error)
 	UserFFBranch(ctx context.Context, in *UserFFBranchRequest, opts ...grpc.CallOption) (*UserFFBranchResponse, error)
+	UserCherryPick(ctx context.Context, in *UserCherryPickRequest, opts ...grpc.CallOption) (*UserCherryPickResponse, error)
 }
 
 type operationServiceClient struct {
@@ -564,6 +671,15 @@ func (c *operationServiceClient) UserFFBranch(ctx context.Context, in *UserFFBra
 	return out, nil
 }
 
+func (c *operationServiceClient) UserCherryPick(ctx context.Context, in *UserCherryPickRequest, opts ...grpc.CallOption) (*UserCherryPickResponse, error) {
+	out := new(UserCherryPickResponse)
+	err := grpc.Invoke(ctx, "/gitaly.OperationService/UserCherryPick", in, out, c.cc, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 // Server API for OperationService service
 
 type OperationServiceServer interface {
@@ -573,6 +689,7 @@ type OperationServiceServer interface {
 	UserDeleteTag(context.Context, *UserDeleteTagRequest) (*UserDeleteTagResponse, error)
 	UserMergeBranch(OperationService_UserMergeBranchServer) error
 	UserFFBranch(context.Context, *UserFFBranchRequest) (*UserFFBranchResponse, error)
+	UserCherryPick(context.Context, *UserCherryPickRequest) (*UserCherryPickResponse, error)
 }
 
 func RegisterOperationServiceServer(s *grpc.Server, srv OperationServiceServer) {
@@ -695,6 +812,24 @@ func _OperationService_UserFFBranch_Handler(srv interface{}, ctx context.Context
 	return interceptor(ctx, in, info, handler)
 }
 
+func _OperationService_UserCherryPick_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(UserCherryPickRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(OperationServiceServer).UserCherryPick(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/gitaly.OperationService/UserCherryPick",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(OperationServiceServer).UserCherryPick(ctx, req.(*UserCherryPickRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 var _OperationService_serviceDesc = grpc.ServiceDesc{
 	ServiceName: "gitaly.OperationService",
 	HandlerType: (*OperationServiceServer)(nil),
@@ -719,6 +854,10 @@ var _OperationService_serviceDesc = grpc.ServiceDesc{
 			MethodName: "UserFFBranch",
 			Handler:    _OperationService_UserFFBranch_Handler,
 		},
+		{
+			MethodName: "UserCherryPick",
+			Handler:    _OperationService_UserCherryPick_Handler,
+		},
 	},
 	Streams: []grpc.StreamDesc{
 		{
@@ -734,48 +873,57 @@ var _OperationService_serviceDesc = grpc.ServiceDesc{
 func init() { proto.RegisterFile("operations.proto", fileDescriptor6) }
 
 var fileDescriptor6 = []byte{
-	// 687 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x56, 0xd1, 0x4e, 0xd4, 0x40,
-	0x14, 0x65, 0xd8, 0x65, 0x59, 0xee, 0x2e, 0xb0, 0x8e, 0x80, 0x75, 0x01, 0x59, 0x27, 0x51, 0x89,
-	0x0f, 0xc4, 0xe0, 0x1f, 0x80, 0x92, 0xa8, 0x11, 0x4d, 0x95, 0xe8, 0x5b, 0x33, 0xec, 0xde, 0x94,
-	0x26, 0x6c, 0x5b, 0x67, 0x06, 0x22, 0x3e, 0x18, 0x9f, 0xf4, 0xc1, 0x17, 0x3f, 0xc1, 0x5f, 0xf0,
-	0x37, 0x7c, 0xf5, 0x87, 0x4c, 0x3b, 0xb7, 0x6c, 0xdb, 0xed, 0x1a, 0x51, 0x13, 0x79, 0x9c, 0x3b,
-	0xb7, 0x67, 0xce, 0x39, 0x73, 0xef, 0x9d, 0x42, 0x27, 0x8a, 0x51, 0x49, 0x13, 0x44, 0xa1, 0xde,
-	0x8a, 0x55, 0x64, 0x22, 0xde, 0xf0, 0x03, 0x23, 0x8f, 0xcf, 0xba, 0x6d, 0x7d, 0x24, 0x15, 0x0e,
-	0x6c, 0x54, 0x7c, 0x63, 0x70, 0xed, 0x40, 0xa3, 0xda, 0x55, 0x28, 0x0d, 0xee, 0x28, 0x19, 0xf6,
-	0x8f, 0x5c, 0x7c, 0x73, 0x82, 0xda, 0xf0, 0x6d, 0x00, 0x85, 0x71, 0xa4, 0x03, 0x13, 0xa9, 0x33,
-	0x87, 0xf5, 0xd8, 0x66, 0x6b, 0x9b, 0x6f, 0x59, 0x98, 0x2d, 0xf7, 0x7c, 0xc7, 0xcd, 0x65, 0xf1,
-	0x0d, 0x68, 0x1d, 0xa6, 0x20, 0x5e, 0x28, 0x87, 0xe8, 0x4c, 0xf7, 0xd8, 0x66, 0xdb, 0x05, 0x1b,
-	0xda, 0x97, 0x43, 0xe4, 0x3d, 0xa8, 0x9f, 0x68, 0x54, 0x4e, 0x2d, 0x85, 0x6b, 0x67, 0x70, 0x09,
-	0x07, 0x37, 0xdd, 0x49, 0x20, 0xb4, 0x91, 0xca, 0x78, 0x71, 0x14, 0x84, 0xc6, 0xa9, 0x5b, 0x88,
-	0x34, 0xf4, 0x3c, 0x89, 0x88, 0x10, 0x9c, 0x71, 0xca, 0x3a, 0x8e, 0x42, 0x8d, 0xfc, 0x36, 0x34,
-	0xec, 0x61, 0xc4, 0x77, 0x21, 0x3b, 0x80, 0xf2, 0x68, 0x97, 0xdf, 0x85, 0x2b, 0xb1, 0x42, 0x4f,
-	0x61, 0x1f, 0x83, 0x53, 0xf4, 0x50, 0xa9, 0x48, 0xa5, 0x6c, 0xe7, 0xdc, 0xc5, 0x58, 0xa1, 0x6b,
-	0xe3, 0x0f, 0x93, 0xb0, 0xf8, 0x42, 0x1e, 0x3d, 0xc0, 0x63, 0xbc, 0x1c, 0x1e, 0x89, 0x3d, 0x6b,
-	0x41, 0x91, 0x11, 0x59, 0x50, 0x29, 0x8d, 0x55, 0x4b, 0xfb, 0xc4, 0x60, 0x69, 0x04, 0xf4, 0x52,
-	0xfa, 0x7f, 0xa3, 0xeb, 0x3a, 0x34, 0x8d, 0xf4, 0xf3, 0xa2, 0x66, 0x8d, 0xf4, 0x7f, 0x53, 0xd1,
-	0x2e, 0x2c, 0x97, 0x88, 0xfc, 0x81, 0x9c, 0xef, 0x24, 0xc7, 0x96, 0xc6, 0x7f, 0x94, 0xc3, 0xef,
-	0xc0, 0xa2, 0x91, 0xca, 0x47, 0xe3, 0x29, 0x3c, 0x0d, 0x74, 0x10, 0x85, 0x54, 0xc8, 0x0b, 0x36,
-	0xec, 0x52, 0x94, 0x3b, 0x30, 0x3b, 0x44, 0xad, 0xa5, 0x8f, 0xce, 0x8c, 0x3d, 0x84, 0x96, 0xe2,
-	0x9d, 0x75, 0x24, 0xa7, 0x85, 0x1c, 0x59, 0x87, 0x9a, 0x91, 0x3e, 0xa9, 0x68, 0x65, 0x87, 0x27,
-	0x19, 0x49, 0x9c, 0xaf, 0x40, 0x03, 0xdf, 0x06, 0xda, 0xe8, 0x94, 0x75, 0xd3, 0xa5, 0x55, 0xb5,
-	0x91, 0xb5, 0x6a, 0x23, 0x7f, 0x30, 0x58, 0x49, 0x0e, 0x7f, 0x8a, 0xca, 0xff, 0x07, 0x15, 0x9f,
-	0xf9, 0x35, 0x3d, 0xd1, 0xaf, 0x55, 0x98, 0xeb, 0x47, 0xc3, 0x61, 0x60, 0xbc, 0x60, 0x40, 0xa4,
-	0x9a, 0x36, 0xf0, 0x68, 0x90, 0x28, 0xa2, 0xa6, 0xb6, 0x1e, 0x66, 0x4d, 0x3c, 0xd1, 0x3b, 0xbe,
-	0x04, 0x33, 0x32, 0x8e, 0x8f, 0xcf, 0x9c, 0x46, 0x6a, 0x81, 0x5d, 0x88, 0x0f, 0xd4, 0xc8, 0x05,
-	0x55, 0x64, 0x6a, 0x81, 0x00, 0x2b, 0x11, 0xd8, 0x81, 0x79, 0xea, 0xd8, 0x93, 0x78, 0x20, 0x0d,
-	0xd2, 0xc5, 0xaf, 0x67, 0x42, 0x9e, 0x65, 0xc3, 0xd6, 0x82, 0x1e, 0xa4, 0x49, 0x6e, 0xfb, 0x30,
-	0xb7, 0x7a, 0x5c, 0x6f, 0x4e, 0x77, 0x6a, 0xe2, 0x3d, 0x2c, 0x57, 0x26, 0xff, 0xfa, 0xfc, 0x9b,
-	0xd0, 0x4e, 0xdc, 0xf4, 0xfa, 0x69, 0x2d, 0x0c, 0xe8, 0x62, 0x5b, 0x49, 0xcc, 0x96, 0xc7, 0x80,
-	0xdf, 0x82, 0x05, 0xa2, 0x98, 0x25, 0xd5, 0xd2, 0x24, 0x22, 0x4e, 0x69, 0xe2, 0x2b, 0x83, 0xab,
-	0x89, 0x05, 0x7b, 0x7b, 0x97, 0xf5, 0x56, 0xc5, 0x47, 0x6a, 0xe2, 0x11, 0x45, 0xba, 0xa2, 0xb1,
-	0x5b, 0x60, 0x17, 0xbe, 0x85, 0x8b, 0xcc, 0xfd, 0xed, 0xcf, 0x75, 0xe8, 0x9c, 0x63, 0xbe, 0x40,
-	0x75, 0x1a, 0xf4, 0x91, 0xbf, 0x82, 0x4e, 0xf9, 0xf1, 0xe1, 0x1b, 0x79, 0xe9, 0x15, 0x2f, 0x69,
-	0xb7, 0x37, 0x39, 0xc1, 0x6a, 0x13, 0x53, 0x19, 0x70, 0x7e, 0xa4, 0x17, 0x81, 0x2b, 0x9e, 0x9f,
-	0x22, 0x70, 0xd5, 0x6b, 0x20, 0xa6, 0xf8, 0x3e, 0xcc, 0x17, 0xe6, 0x08, 0x5f, 0x1b, 0x67, 0x33,
-	0x1a, 0x95, 0xdd, 0xf5, 0x09, 0xbb, 0x65, 0xbc, 0xf3, 0x49, 0x5d, 0xc4, 0x2b, 0xbf, 0x24, 0x45,
-	0xbc, 0xb1, 0xf1, 0x2e, 0xa6, 0xf8, 0x6b, 0x58, 0x2c, 0x35, 0x25, 0xbf, 0x91, 0xff, 0x66, 0x7c,
-	0x06, 0x75, 0x37, 0x26, 0xee, 0x67, 0xa8, 0x9b, 0xec, 0x1e, 0xe3, 0x4f, 0xa0, 0x9d, 0x2f, 0x24,
-	0xbe, 0x9a, 0xff, 0xac, 0xd4, 0x01, 0xdd, 0xb5, 0xea, 0xcd, 0x0c, 0xf0, 0xb0, 0x91, 0xfe, 0x30,
-	0xdd, 0xff, 0x19, 0x00, 0x00, 0xff, 0xff, 0xfa, 0xa2, 0x89, 0xd5, 0x5a, 0x09, 0x00, 0x00,
+	// 819 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x56, 0xcd, 0x6e, 0xd3, 0x40,
+	0x10, 0xae, 0x93, 0x34, 0x4d, 0x27, 0x69, 0x92, 0x2e, 0x6d, 0x31, 0xe9, 0x5f, 0xb0, 0x04, 0x94,
+	0x1e, 0x2a, 0x54, 0xce, 0x5c, 0x5a, 0x28, 0x02, 0x44, 0x29, 0xa6, 0x15, 0xdc, 0xac, 0x6d, 0x32,
+	0x72, 0x2d, 0x9a, 0xd8, 0xac, 0xb7, 0x15, 0xe1, 0x80, 0x38, 0xc1, 0x95, 0x47, 0xe0, 0x15, 0x78,
+	0x01, 0x1e, 0x80, 0x2b, 0x07, 0x6e, 0x3c, 0x0b, 0xb2, 0x77, 0x9c, 0xd8, 0x8e, 0x8d, 0x28, 0x14,
+	0xd1, 0xa3, 0x67, 0xc6, 0xdf, 0x7e, 0xf3, 0xcd, 0xec, 0xcc, 0x42, 0xd3, 0xf5, 0x50, 0x70, 0xe9,
+	0xb8, 0x7d, 0x7f, 0xc3, 0x13, 0xae, 0x74, 0x59, 0xd9, 0x76, 0x24, 0x3f, 0x1e, 0xb4, 0x6a, 0xfe,
+	0x11, 0x17, 0xd8, 0x55, 0x56, 0xe3, 0xb3, 0x06, 0x97, 0x0f, 0x7c, 0x14, 0xdb, 0x02, 0xb9, 0xc4,
+	0x2d, 0xc1, 0xfb, 0x9d, 0x23, 0x13, 0x5f, 0x9d, 0xa0, 0x2f, 0xd9, 0x26, 0x80, 0x40, 0xcf, 0xf5,
+	0x1d, 0xe9, 0x8a, 0x81, 0xae, 0xb5, 0xb5, 0xb5, 0xea, 0x26, 0xdb, 0x50, 0x30, 0x1b, 0xe6, 0xd0,
+	0x63, 0xc6, 0xa2, 0xd8, 0x2a, 0x54, 0x0f, 0x43, 0x10, 0xab, 0xcf, 0x7b, 0xa8, 0x17, 0xda, 0xda,
+	0x5a, 0xcd, 0x04, 0x65, 0xda, 0xe5, 0x3d, 0x64, 0x6d, 0x28, 0x9d, 0xf8, 0x28, 0xf4, 0x62, 0x08,
+	0x57, 0x8b, 0xe0, 0x02, 0x0e, 0x66, 0xe8, 0x09, 0x20, 0x7c, 0xc9, 0x85, 0xb4, 0x3c, 0xd7, 0xe9,
+	0x4b, 0xbd, 0xa4, 0x20, 0x42, 0xd3, 0x5e, 0x60, 0x31, 0xfa, 0xa0, 0x8f, 0x53, 0xf6, 0x3d, 0xb7,
+	0xef, 0x23, 0xbb, 0x0e, 0x65, 0x75, 0x18, 0xf1, 0xad, 0x47, 0x07, 0x50, 0x1c, 0x79, 0xd9, 0x3a,
+	0xcc, 0x7a, 0x02, 0x2d, 0x81, 0x1d, 0x74, 0x4e, 0xd1, 0x42, 0x21, 0x5c, 0x11, 0xb2, 0x9d, 0x36,
+	0x1b, 0x9e, 0x40, 0x53, 0xd9, 0xef, 0x05, 0x66, 0xe3, 0x23, 0x69, 0x74, 0x17, 0x8f, 0xf1, 0x62,
+	0x68, 0x64, 0xec, 0x28, 0x09, 0x92, 0x8c, 0x48, 0x82, 0xcc, 0xd4, 0xb4, 0xec, 0xd4, 0x3e, 0x68,
+	0x30, 0x37, 0x02, 0xda, 0xe7, 0xf6, 0xdf, 0xe4, 0x75, 0x05, 0x2a, 0x92, 0xdb, 0xf1, 0xa4, 0xa6,
+	0x24, 0xb7, 0x7f, 0x33, 0xa3, 0x6d, 0x98, 0x4f, 0x11, 0xf9, 0x83, 0x74, 0xbe, 0x52, 0x3a, 0xaa,
+	0x35, 0xfe, 0x63, 0x3a, 0xec, 0x06, 0x34, 0x24, 0x17, 0x36, 0x4a, 0x4b, 0xe0, 0xa9, 0xe3, 0x3b,
+	0x6e, 0x9f, 0x1a, 0xb9, 0xae, 0xcc, 0x26, 0x59, 0x99, 0x0e, 0x53, 0x3d, 0xf4, 0x7d, 0x6e, 0xa3,
+	0x3e, 0xa9, 0x0e, 0xa1, 0x4f, 0xe3, 0x8d, 0x52, 0x24, 0x96, 0x0b, 0x29, 0xb2, 0x0c, 0x45, 0xc9,
+	0x6d, 0xca, 0xa2, 0x1a, 0x1d, 0x1e, 0x44, 0x04, 0x76, 0xb6, 0x00, 0x65, 0x7c, 0xed, 0xf8, 0xd2,
+	0x0f, 0x59, 0x57, 0x4c, 0xfa, 0xca, 0x16, 0xb2, 0x98, 0x2d, 0xe4, 0x37, 0x0d, 0x16, 0x82, 0xc3,
+	0x1f, 0xa3, 0xb0, 0xcf, 0xa1, 0xe3, 0x23, 0xbd, 0x0a, 0xb9, 0x7a, 0x2d, 0xc2, 0x74, 0xc7, 0xed,
+	0xf5, 0x1c, 0x69, 0x39, 0x5d, 0x22, 0x55, 0x51, 0x86, 0x07, 0xdd, 0x20, 0x23, 0xba, 0xd4, 0x4a,
+	0xc3, 0xe8, 0x12, 0xe7, 0x6a, 0xc7, 0xe6, 0x60, 0x92, 0x7b, 0xde, 0xf1, 0x40, 0x2f, 0x87, 0x12,
+	0xa8, 0x0f, 0xe3, 0x1d, 0x5d, 0xe4, 0x44, 0x56, 0x24, 0x6a, 0x82, 0x80, 0x96, 0x22, 0xb0, 0x05,
+	0x33, 0x74, 0x63, 0x4f, 0xbc, 0x2e, 0x97, 0x48, 0x85, 0x5f, 0x8e, 0x12, 0x79, 0x12, 0x0d, 0x5b,
+	0x05, 0x7a, 0x10, 0x06, 0x99, 0xb5, 0xc3, 0xd8, 0xd7, 0xc3, 0x52, 0xa5, 0xd0, 0x2c, 0x1a, 0x6f,
+	0x61, 0x3e, 0x33, 0xf8, 0xd7, 0xe7, 0x5f, 0x85, 0x5a, 0xa0, 0xa6, 0xd5, 0x09, 0x7b, 0xa1, 0x4b,
+	0x85, 0xad, 0x06, 0x36, 0xd5, 0x1e, 0x5d, 0x76, 0x0d, 0xea, 0x44, 0x31, 0x0a, 0x2a, 0x86, 0x41,
+	0x44, 0x9c, 0xc2, 0x8c, 0x4f, 0x1a, 0x5c, 0x0a, 0x24, 0xd8, 0xd9, 0xb9, 0xa8, 0x55, 0x35, 0xde,
+	0xd3, 0x25, 0x1e, 0x51, 0xa4, 0x12, 0x8d, 0x55, 0x41, 0x3b, 0x73, 0x15, 0xce, 0x34, 0xf7, 0xbf,
+	0x14, 0xe8, 0x06, 0x1e, 0xa1, 0x10, 0x83, 0x3d, 0xa7, 0xf3, 0xf2, 0xdf, 0xaa, 0x75, 0x13, 0xca,
+	0x4a, 0x1c, 0x6a, 0xaf, 0xd9, 0x28, 0xe6, 0xbe, 0x23, 0xb7, 0x43, 0x87, 0x49, 0x01, 0xe9, 0x15,
+	0x52, 0x1a, 0x5b, 0x21, 0xf9, 0x57, 0x63, 0x1d, 0x66, 0xd5, 0x7a, 0x8d, 0x03, 0x94, 0xc3, 0x98,
+	0x46, 0xe8, 0xd8, 0x1a, 0xa1, 0xdc, 0x81, 0xa6, 0x8a, 0x8d, 0x65, 0x3b, 0x95, 0x9b, 0xad, 0xfa,
+	0x7d, 0x64, 0x30, 0xbe, 0xd3, 0x14, 0x89, 0x0b, 0x78, 0xbe, 0xb5, 0x54, 0xbd, 0x6e, 0x49, 0x81,
+	0xf1, 0x5a, 0x56, 0xcc, 0x86, 0x72, 0xec, 0x0b, 0x54, 0xb5, 0x0c, 0x6e, 0x10, 0x75, 0x62, 0x7c,
+	0xee, 0x55, 0x95, 0x4d, 0x85, 0x64, 0xb6, 0x46, 0x29, 0xb3, 0x35, 0x36, 0x7f, 0x94, 0xa0, 0x39,
+	0xa4, 0xf8, 0x0c, 0xc5, 0xa9, 0xd3, 0x41, 0xf6, 0x1c, 0x9a, 0xe9, 0x77, 0x09, 0x5b, 0x8d, 0xd7,
+	0x39, 0xe3, 0x91, 0xd5, 0x6a, 0xe7, 0x07, 0x28, 0xa9, 0x8c, 0x89, 0x08, 0x38, 0xbe, 0xed, 0x93,
+	0xc0, 0x19, 0x2f, 0x93, 0x24, 0x70, 0xd6, 0x43, 0xc1, 0x98, 0x60, 0xbb, 0x30, 0x93, 0x58, 0x31,
+	0x6c, 0x69, 0x9c, 0xcd, 0x68, 0x8b, 0xb6, 0x96, 0x73, 0xbc, 0x69, 0xbc, 0xe1, 0x12, 0x4f, 0xe2,
+	0xa5, 0x1f, 0x19, 0x49, 0xbc, 0xb1, 0xcd, 0x6f, 0x4c, 0xb0, 0x17, 0xd0, 0x48, 0xcd, 0x6b, 0xb6,
+	0x12, 0xff, 0x67, 0x7c, 0x3d, 0xb5, 0x56, 0x73, 0xfd, 0x11, 0xea, 0x9a, 0x76, 0x4b, 0x63, 0x8f,
+	0xa0, 0x16, 0x9f, 0x31, 0x6c, 0x31, 0xfe, 0x5b, 0x6a, 0x38, 0xb6, 0x96, 0xb2, 0x9d, 0x43, 0x9a,
+	0x4f, 0xa1, 0x9e, 0x6c, 0x73, 0x96, 0x54, 0x2a, 0x3d, 0x3f, 0x5a, 0x2b, 0x79, 0xee, 0x08, 0xf2,
+	0xb0, 0x1c, 0x3e, 0xcf, 0x6f, 0xff, 0x0c, 0x00, 0x00, 0xff, 0xff, 0x7d, 0x8b, 0x35, 0x2e, 0xc8,
+	0x0b, 0x00, 0x00,
 }
diff --git a/vendor/vendor.json b/vendor/vendor.json
index 60754df65..0239ed1e2 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -201,12 +201,12 @@
 			"revisionTime": "2017-01-30T11:31:45Z"
 		},
 		{
-			"checksumSHA1": "Egwbmg0DMI1ZPizY/eX4+oGUFXY=",
+			"checksumSHA1": "JOqoJmyKmKMtNKRp+DUZRAv860g=",
 			"path": "gitlab.com/gitlab-org/gitaly-proto/go",
-			"revision": "7627289e5c137ffd7e65b7654eb50ba76e535b51",
-			"revisionTime": "2017-11-14T20:38:11Z",
-			"version": "v0.54.0",
-			"versionExact": "v0.54.0"
+			"revision": "584c465128b8d7ad03f320d8ea03cff4be9282a7",
+			"revisionTime": "2017-11-23T05:32:13Z",
+			"version": "v0.55.0",
+			"versionExact": "v0.55.0"
 		},
 		{
 			"checksumSHA1": "nqWNlnMmVpt628zzvyo6Yv2CX5Q=",