Merge branch '1150-list-file-names-by-content-name' into 'master'

SearchFilesBy{Content,Name} Server Implementation

Closes #1150

See merge request gitlab-org/gitaly!677

11 files changed, 783 insertions, 146 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4a1a75bad..67c699650 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 UNRELEASED
 
+- Implement SearchFilesBy{Content,Name}
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/677
 - Introduce feature flag package based on gRPC metadata
   https://gitlab.com/gitlab-org/gitaly/merge_requests/704
 
diff --git a/internal/service/repository/search_files.go b/internal/service/repository/search_files.go
new file mode 100644
index 000000000..479ccff78
--- /dev/null
+++ b/internal/service/repository/search_files.go
@@ -0,0 +1,113 @@
+package repository
+
+import (
+	"bytes"
+	"errors"
+
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
+
+	pb "gitlab.com/gitlab-org/gitaly-proto/go"
+	"gitlab.com/gitlab-org/gitaly/internal/git"
+	"gitlab.com/gitlab-org/gitaly/internal/helper"
+	"gitlab.com/gitlab-org/gitaly/internal/helper/lines"
+)
+
+const surroundContext = "2"
+
+var contentDelimiter = []byte("--\n")
+
+func (s *server) SearchFilesByContent(req *pb.SearchFilesByContentRequest, stream pb.RepositoryService_SearchFilesByContentServer) error {
+	if err := validateSearchFilesRequest(req); err != nil {
+		return helper.DecorateError(codes.InvalidArgument, err)
+	}
+	repo := req.GetRepository()
+	if repo == nil {
+		return status.Errorf(codes.InvalidArgument, "SearchFilesByContent: empty Repository")
+	}
+
+	ctx := stream.Context()
+	cmd, err := git.Command(ctx, repo, "grep",
+		"--ignore-case",
+		"-I", // Don't match binary, there is no long-name for this one
+		"--line-number",
+		"--null",
+		"--before-context", surroundContext,
+		"--after-context", surroundContext,
+		"--extended-regexp",
+		"-e", // next arg is pattern, keep this last
+		req.GetQuery(),
+		string(req.GetRef()),
+	)
+	if err != nil {
+		return status.Errorf(codes.Internal, "SearchFilesByContent: cmd start failed: %v", err)
+	}
+
+	var (
+		buf     []byte
+		matches [][]byte
+	)
+	reader := func(objs [][]byte) error {
+		for _, obj := range objs {
+			obj = append(obj, '\n')
+			if bytes.Compare(obj, contentDelimiter) == 0 {
+				matches = append(matches, buf)
+				buf = nil
+			} else {
+				buf = append(buf, obj...)
+			}
+		}
+		if len(matches) > 1 {
+			err = stream.Send(&pb.SearchFilesByContentResponse{Matches: matches})
+			matches = nil
+			return err
+		}
+		return nil
+	}
+
+	err = lines.Send(cmd, reader, []byte{'\n'})
+	if err != nil {
+		return helper.DecorateError(codes.Internal, err)
+	}
+	if len(buf) > 1 {
+		return stream.Send(&pb.SearchFilesByContentResponse{Matches: [][]byte{buf}})
+	}
+	return nil
+}
+
+func (s *server) SearchFilesByName(req *pb.SearchFilesByNameRequest, stream pb.RepositoryService_SearchFilesByNameServer) error {
+	if err := validateSearchFilesRequest(req); err != nil {
+		return helper.DecorateError(codes.InvalidArgument, err)
+	}
+	repo := req.GetRepository()
+	if repo == nil {
+		return status.Errorf(codes.InvalidArgument, "SearchFilesByName: empty Repository")
+	}
+
+	ctx := stream.Context()
+	cmd, err := git.Command(ctx, repo, "ls-tree", "--full-tree", "--name-status", "-r", string(req.GetRef()), req.GetQuery())
+	if err != nil {
+		return status.Errorf(codes.Internal, "SearchFilesByName: cmd start failed: %v", err)
+	}
+
+	lr := func(objs [][]byte) error {
+		return stream.Send(&pb.SearchFilesByNameResponse{Files: objs})
+	}
+
+	return lines.Send(cmd, lr, []byte{'\n'})
+}
+
+type searchFilesRequest interface {
+	GetRef() []byte
+	GetQuery() string
+}
+
+func validateSearchFilesRequest(req searchFilesRequest) error {
+	if len(req.GetQuery()) == 0 {
+		return errors.New("no query given")
+	}
+	if len(req.GetRef()) == 0 {
+		return errors.New("no ref given")
+	}
+	return nil
+}
diff --git a/internal/service/repository/search_files_test.go b/internal/service/repository/search_files_test.go
new file mode 100644
index 000000000..042b929cb
--- /dev/null
+++ b/internal/service/repository/search_files_test.go
@@ -0,0 +1,299 @@
+package repository
+
+import (
+	"bytes"
+	"io"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+	pb "gitlab.com/gitlab-org/gitaly-proto/go"
+	"gitlab.com/gitlab-org/gitaly/internal/testhelper"
+	"google.golang.org/grpc/codes"
+)
+
+var (
+	contentOutputLines = [][]byte{bytes.Join([][]byte{
+		[]byte("many_files:files/markdown/ruby-style-guide.md\x00128\x00    ```Ruby"),
+		[]byte("many_files:files/markdown/ruby-style-guide.md\x00129\x00    # bad"),
+		[]byte("many_files:files/markdown/ruby-style-guide.md\x00130\x00    puts 'foobar'; # superfluous semicolon"),
+		[]byte("many_files:files/markdown/ruby-style-guide.md\x00131\x00"),
+		[]byte("many_files:files/markdown/ruby-style-guide.md\x00132\x00    puts 'foo'; puts 'bar' # two expression on the same line"),
+		[]byte("many_files:files/markdown/ruby-style-guide.md\x00133\x00"),
+		[]byte("many_files:files/markdown/ruby-style-guide.md\x00134\x00    # good"),
+		[]byte("many_files:files/markdown/ruby-style-guide.md\x00135\x00    puts 'foobar'"),
+		[]byte("many_files:files/markdown/ruby-style-guide.md\x00136\x00"),
+		[]byte("many_files:files/markdown/ruby-style-guide.md\x00137\x00    puts 'foo'"),
+		[]byte(""),
+	}, []byte{'\n'})}
+	contentMultiLines = [][]byte{
+		bytes.Join([][]byte{
+			[]byte("many_files:CHANGELOG\x00306\x00  - Gitlab::Git set of objects to abstract from grit library"),
+			[]byte("many_files:CHANGELOG\x00307\x00  - Replace Unicorn web server with Puma"),
+			[]byte("many_files:CHANGELOG\x00308\x00  - Backup/Restore refactored. Backup dump project wiki too now"),
+			[]byte("many_files:CHANGELOG\x00309\x00  - Restyled Issues list. Show milestone version in issue row"),
+			[]byte("many_files:CHANGELOG\x00310\x00  - Restyled Merge Request list"),
+			[]byte("many_files:CHANGELOG\x00311\x00  - Backup now dump/restore uploads"),
+			[]byte("many_files:CHANGELOG\x00312\x00  - Improved performance of dashboard (Andrew Kumanyaev)"),
+			[]byte("many_files:CHANGELOG\x00313\x00  - File history now tracks renames (Akzhan Abdulin)"),
+			[]byte(""),
+		}, []byte{'\n'}),
+		bytes.Join([][]byte{
+			[]byte("many_files:CHANGELOG\x00377\x00  - fix routing issues"),
+			[]byte("many_files:CHANGELOG\x00378\x00  - cleanup rake tasks"),
+			[]byte("many_files:CHANGELOG\x00379\x00  - fix backup/restore"),
+			[]byte("many_files:CHANGELOG\x00380\x00  - scss cleanup"),
+			[]byte("many_files:CHANGELOG\x00381\x00  - show preview for note images"),
+			[]byte(""),
+		}, []byte{'\n'}),
+		bytes.Join([][]byte{
+			[]byte("many_files:CHANGELOG\x00393\x00  - Remove project code and path from API. Use id instead"),
+			[]byte("many_files:CHANGELOG\x00394\x00  - Return valid cloneable url to repo for web hook"),
+			[]byte("many_files:CHANGELOG\x00395\x00  - Fixed backup issue"),
+			[]byte("many_files:CHANGELOG\x00396\x00  - Reorganized settings"),
+			[]byte("many_files:CHANGELOG\x00397\x00  - Fixed commits compare"),
+			[]byte(""),
+		}, []byte{'\n'}),
+	}
+)
+
+func TestSearchFilesByContentSuccessful(t *testing.T) {
+	ctx, cancel := testhelper.Context()
+	defer cancel()
+
+	server, serverSocketPath := runRepoServer(t)
+	defer server.Stop()
+
+	client, conn := newRepositoryClient(t, serverSocketPath)
+	defer conn.Close()
+
+	testRepo, _, cleanupFn := testhelper.NewTestRepo(t)
+	defer cleanupFn()
+
+	testCases := []struct {
+		desc   string
+		query  string
+		ref    string
+		output [][]byte
+	}{
+		{
+			desc:   "single file in many_files",
+			query:  "foobar",
+			ref:    "many_files",
+			output: contentOutputLines,
+		},
+		{
+			desc:   "multi file in many_files",
+			query:  "backup",
+			ref:    "many_files",
+			output: contentMultiLines,
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.desc, func(t *testing.T) {
+			stream, err := client.SearchFilesByContent(ctx, &pb.SearchFilesByContentRequest{
+				Repository: testRepo,
+				Query:      tc.query,
+				Ref:        []byte(tc.ref),
+			})
+			require.NoError(t, err)
+
+			resp, err := consumeFilenameByContent(stream)
+			require.NoError(t, err)
+
+			require.NotEmpty(t, resp)
+			require.Equal(t, len(tc.output), len(resp))
+			for i := 0; i < len(tc.output); i++ {
+				require.Equal(t, tc.output[i], resp[i])
+			}
+		})
+	}
+}
+
+func TestSearchFilesByContentFailure(t *testing.T) {
+	ctx, cancel := testhelper.Context()
+	defer cancel()
+
+	server, serverSocketPath := runRepoServer(t)
+	defer server.Stop()
+
+	client, conn := newRepositoryClient(t, serverSocketPath)
+	defer conn.Close()
+
+	testCases := []struct {
+		desc  string
+		repo  *pb.Repository
+		query string
+		ref   string
+		code  codes.Code
+		msg   string
+	}{
+		{
+			desc: "empty request",
+			code: codes.InvalidArgument,
+			msg:  "no query given",
+		},
+		{
+			desc:  "only query given",
+			query: "foo",
+			code:  codes.InvalidArgument,
+			msg:   "no ref given",
+		},
+		{
+			desc:  "no repo",
+			query: "foo",
+			ref:   "master",
+			code:  codes.InvalidArgument,
+			msg:   "empty Repo",
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.desc, func(t *testing.T) {
+
+			stream, err := client.SearchFilesByContent(ctx, &pb.SearchFilesByContentRequest{
+				Repository: tc.repo,
+				Query:      tc.query,
+				Ref:        []byte(tc.ref),
+			})
+			require.NoError(t, err)
+
+			_, err = consumeFilenameByContent(stream)
+			testhelper.AssertGrpcError(t, err, tc.code, tc.msg)
+		})
+	}
+}
+
+func TestSearchFilesByNameSuccessful(t *testing.T) {
+	ctx, cancel := testhelper.Context()
+	defer cancel()
+
+	server, serverSocketPath := runRepoServer(t)
+	defer server.Stop()
+
+	client, conn := newRepositoryClient(t, serverSocketPath)
+	defer conn.Close()
+
+	testRepo, _, cleanupFn := testhelper.NewTestRepo(t)
+	defer cleanupFn()
+
+	testCases := []struct {
+		ref      []byte
+		query    string
+		numFiles int
+		testFile []byte
+	}{
+		{
+			ref:      []byte("many_files"),
+			query:    "files/images/logo-black.png",
+			numFiles: 1,
+			testFile: []byte("files/images/logo-black.png"),
+		},
+		{
+			ref:      []byte("many_files"),
+			query:    "many_files",
+			numFiles: 1001,
+			testFile: []byte("many_files/99"),
+		},
+	}
+
+	for _, tc := range testCases {
+		stream, err := client.SearchFilesByName(ctx, &pb.SearchFilesByNameRequest{
+			Repository: testRepo,
+			Ref:        tc.ref,
+			Query:      tc.query,
+		})
+		require.NoError(t, err)
+
+		var files [][]byte
+		files, err = consumeFilenameByName(stream)
+		require.NoError(t, err)
+
+		require.Equal(t, tc.numFiles, len(files))
+		require.Contains(t, files, tc.testFile)
+	}
+}
+
+func TestSearchFilesByNameFailure(t *testing.T) {
+	ctx, cancel := testhelper.Context()
+	defer cancel()
+
+	server, serverSocketPath := runRepoServer(t)
+	defer server.Stop()
+
+	client, conn := newRepositoryClient(t, serverSocketPath)
+	defer conn.Close()
+
+	testCases := []struct {
+		desc  string
+		repo  *pb.Repository
+		query string
+		ref   string
+		code  codes.Code
+		msg   string
+	}{
+		{
+			desc: "empty request",
+			code: codes.InvalidArgument,
+			msg:  "no query given",
+		},
+		{
+			desc:  "only query given",
+			query: "foo",
+			code:  codes.InvalidArgument,
+			msg:   "no ref given",
+		},
+		{
+			desc:  "no repo",
+			query: "foo",
+			ref:   "master",
+			code:  codes.InvalidArgument,
+			msg:   "empty Repo",
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.desc, func(t *testing.T) {
+
+			stream, err := client.SearchFilesByName(ctx, &pb.SearchFilesByNameRequest{
+				Repository: tc.repo,
+				Query:      tc.query,
+				Ref:        []byte(tc.ref),
+			})
+			require.NoError(t, err)
+
+			_, err = consumeFilenameByName(stream)
+			testhelper.AssertGrpcError(t, err, tc.code, tc.msg)
+		})
+	}
+}
+
+func consumeFilenameByContent(stream pb.RepositoryService_SearchFilesByContentClient) ([][]byte, error) {
+	ret := make([][]byte, 0)
+	for done := false; !done; {
+		resp, err := stream.Recv()
+		if err == io.EOF {
+			break
+		}
+		if err != nil {
+			return nil, err
+		}
+		ret = append(ret, resp.Matches...)
+	}
+	return ret, nil
+}
+
+func consumeFilenameByName(stream pb.RepositoryService_SearchFilesByNameClient) ([][]byte, error) {
+	ret := make([][]byte, 0)
+	for done := false; !done; {
+		resp, err := stream.Recv()
+		if err == io.EOF {
+			break
+		}
+		if err != nil {
+			return nil, err
+		}
+		ret = append(ret, resp.Files...)
+	}
+	return ret, nil
+}
diff --git a/ruby/Gemfile b/ruby/Gemfile
index bad9ea74e..fd8e6b402 100644
--- a/ruby/Gemfile
+++ b/ruby/Gemfile
@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 gem 'rugged', '~> 0.27.0'
 gem 'github-linguist', '~> 5.3.3', require: 'linguist'
 gem 'gitlab-markup', '~> 1.6.2'
-gem 'gitaly-proto', '~> 0.98.0', require: 'gitaly'
+gem 'gitaly-proto', '~> 0.99.0', require: 'gitaly'
 gem 'activesupport', '~> 5.0.2'
 gem 'rdoc', '~> 4.2'
 gem 'gitlab-gollum-lib', '~> 4.2', require: false
diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock
index 2542754b7..fb6355322 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.98.0)
+    gitaly-proto (0.99.0)
       google-protobuf (~> 3.1)
       grpc (~> 1.10)
     github-linguist (5.3.3)
@@ -141,7 +141,7 @@ PLATFORMS
 
 DEPENDENCIES
   activesupport (~> 5.0.2)
-  gitaly-proto (~> 0.98.0)
+  gitaly-proto (~> 0.99.0)
   github-linguist (~> 5.3.3)
   gitlab-gollum-lib (~> 4.2)
   gitlab-gollum-rugged_adapter (~> 0.4.4)
diff --git a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION
index 95fce8ca2..01781720c 100644
--- a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION
+++ b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION
@@ -1 +1 @@
-0.98.0
+0.99.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 c7dcad133..d3e3209ca 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
@@ -225,6 +225,10 @@ It has these top-level messages:
 	CreateRepositoryFromSnapshotResponse
 	GetRawChangesRequest
 	GetRawChangesResponse
+	SearchFilesByNameRequest
+	SearchFilesByNameResponse
+	SearchFilesByContentRequest
+	SearchFilesByContentResponse
 	ServerInfoRequest
 	ServerInfoResponse
 	Repository
diff --git a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/conflicts.pb.go b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/conflicts.pb.go
index a6144ac21..8fc147001 100644
--- a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/conflicts.pb.go
+++ b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/conflicts.pb.go
@@ -109,9 +109,7 @@ func (m *ConflictFile) String() string            { return proto.CompactTextStri
 func (*ConflictFile) ProtoMessage()               {}
 func (*ConflictFile) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{2} }
 
-type isConflictFile_ConflictFilePayload interface {
-	isConflictFile_ConflictFilePayload()
-}
+type isConflictFile_ConflictFilePayload interface{ isConflictFile_ConflictFilePayload() }
 
 type ConflictFile_Header struct {
 	Header *ConflictFileHeader `protobuf:"bytes,1,opt,name=header,oneof"`
@@ -314,9 +312,7 @@ func (m *ResolveConflictsRequest) String() string            { return proto.Comp
 func (*ResolveConflictsRequest) ProtoMessage()               {}
 func (*ResolveConflictsRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{5} }
 
-type isResolveConflictsRequest_ResolveConflictsRequestPayload interface {
-	isResolveConflictsRequest_ResolveConflictsRequestPayload()
-}
+type isResolveConflictsRequest_ResolveConflictsRequestPayload interface{ isResolveConflictsRequest_ResolveConflictsRequestPayload() }
 
 type ResolveConflictsRequest_Header struct {
 	Header *ResolveConflictsRequestHeader `protobuf:"bytes,1,opt,name=header,oneof"`
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 558ad8e08..0fdbbadfb 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
@@ -745,9 +745,7 @@ func (m *UserCommitFilesAction) String() string            { return proto.Compac
 func (*UserCommitFilesAction) ProtoMessage()               {}
 func (*UserCommitFilesAction) Descriptor() ([]byte, []int) { return fileDescriptor7, []int{18} }
 
-type isUserCommitFilesAction_UserCommitFilesActionPayload interface {
-	isUserCommitFilesAction_UserCommitFilesActionPayload()
-}
+type isUserCommitFilesAction_UserCommitFilesActionPayload interface{ isUserCommitFilesAction_UserCommitFilesActionPayload() }
 
 type UserCommitFilesAction_Header struct {
 	Header *UserCommitFilesActionHeader `protobuf:"bytes,1,opt,name=header,oneof"`
@@ -934,9 +932,7 @@ func (m *UserCommitFilesRequest) String() string            { return proto.Compa
 func (*UserCommitFilesRequest) ProtoMessage()               {}
 func (*UserCommitFilesRequest) Descriptor() ([]byte, []int) { return fileDescriptor7, []int{20} }
 
-type isUserCommitFilesRequest_UserCommitFilesRequestPayload interface {
-	isUserCommitFilesRequest_UserCommitFilesRequestPayload()
-}
+type isUserCommitFilesRequest_UserCommitFilesRequestPayload interface{ isUserCommitFilesRequest_UserCommitFilesRequestPayload() }
 
 type UserCommitFilesRequest_Header struct {
 	Header *UserCommitFilesRequestHeader `protobuf:"bytes,1,opt,name=header,oneof"`
diff --git a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/repository-service.pb.go b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/repository-service.pb.go
index 4f69aefc8..345fb598a 100644
--- a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/repository-service.pb.go
+++ b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/repository-service.pb.go
@@ -1223,6 +1223,102 @@ func (m *GetRawChangesResponse_RawChange) GetRawOperation() string {
 	return ""
 }
 
+type SearchFilesByNameRequest struct {
+	Repository *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"`
+	Query      string      `protobuf:"bytes,2,opt,name=query" json:"query,omitempty"`
+	Ref        []byte      `protobuf:"bytes,3,opt,name=ref,proto3" json:"ref,omitempty"`
+}
+
+func (m *SearchFilesByNameRequest) Reset()                    { *m = SearchFilesByNameRequest{} }
+func (m *SearchFilesByNameRequest) String() string            { return proto.CompactTextString(m) }
+func (*SearchFilesByNameRequest) ProtoMessage()               {}
+func (*SearchFilesByNameRequest) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{56} }
+
+func (m *SearchFilesByNameRequest) GetRepository() *Repository {
+	if m != nil {
+		return m.Repository
+	}
+	return nil
+}
+
+func (m *SearchFilesByNameRequest) GetQuery() string {
+	if m != nil {
+		return m.Query
+	}
+	return ""
+}
+
+func (m *SearchFilesByNameRequest) GetRef() []byte {
+	if m != nil {
+		return m.Ref
+	}
+	return nil
+}
+
+type SearchFilesByNameResponse struct {
+	Files [][]byte `protobuf:"bytes,1,rep,name=files,proto3" json:"files,omitempty"`
+}
+
+func (m *SearchFilesByNameResponse) Reset()                    { *m = SearchFilesByNameResponse{} }
+func (m *SearchFilesByNameResponse) String() string            { return proto.CompactTextString(m) }
+func (*SearchFilesByNameResponse) ProtoMessage()               {}
+func (*SearchFilesByNameResponse) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{57} }
+
+func (m *SearchFilesByNameResponse) GetFiles() [][]byte {
+	if m != nil {
+		return m.Files
+	}
+	return nil
+}
+
+type SearchFilesByContentRequest struct {
+	Repository *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"`
+	Query      string      `protobuf:"bytes,2,opt,name=query" json:"query,omitempty"`
+	Ref        []byte      `protobuf:"bytes,3,opt,name=ref,proto3" json:"ref,omitempty"`
+}
+
+func (m *SearchFilesByContentRequest) Reset()                    { *m = SearchFilesByContentRequest{} }
+func (m *SearchFilesByContentRequest) String() string            { return proto.CompactTextString(m) }
+func (*SearchFilesByContentRequest) ProtoMessage()               {}
+func (*SearchFilesByContentRequest) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{58} }
+
+func (m *SearchFilesByContentRequest) GetRepository() *Repository {
+	if m != nil {
+		return m.Repository
+	}
+	return nil
+}
+
+func (m *SearchFilesByContentRequest) GetQuery() string {
+	if m != nil {
+		return m.Query
+	}
+	return ""
+}
+
+func (m *SearchFilesByContentRequest) GetRef() []byte {
+	if m != nil {
+		return m.Ref
+	}
+	return nil
+}
+
+type SearchFilesByContentResponse struct {
+	Matches [][]byte `protobuf:"bytes,1,rep,name=matches,proto3" json:"matches,omitempty"`
+}
+
+func (m *SearchFilesByContentResponse) Reset()                    { *m = SearchFilesByContentResponse{} }
+func (m *SearchFilesByContentResponse) String() string            { return proto.CompactTextString(m) }
+func (*SearchFilesByContentResponse) ProtoMessage()               {}
+func (*SearchFilesByContentResponse) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{59} }
+
+func (m *SearchFilesByContentResponse) GetMatches() [][]byte {
+	if m != nil {
+		return m.Matches
+	}
+	return nil
+}
+
 func init() {
 	proto.RegisterType((*RepositoryExistsRequest)(nil), "gitaly.RepositoryExistsRequest")
 	proto.RegisterType((*RepositoryExistsResponse)(nil), "gitaly.RepositoryExistsResponse")
@@ -1281,6 +1377,10 @@ func init() {
 	proto.RegisterType((*GetRawChangesRequest)(nil), "gitaly.GetRawChangesRequest")
 	proto.RegisterType((*GetRawChangesResponse)(nil), "gitaly.GetRawChangesResponse")
 	proto.RegisterType((*GetRawChangesResponse_RawChange)(nil), "gitaly.GetRawChangesResponse.RawChange")
+	proto.RegisterType((*SearchFilesByNameRequest)(nil), "gitaly.SearchFilesByNameRequest")
+	proto.RegisterType((*SearchFilesByNameResponse)(nil), "gitaly.SearchFilesByNameResponse")
+	proto.RegisterType((*SearchFilesByContentRequest)(nil), "gitaly.SearchFilesByContentRequest")
+	proto.RegisterType((*SearchFilesByContentResponse)(nil), "gitaly.SearchFilesByContentResponse")
 	proto.RegisterEnum("gitaly.GetArchiveRequest_Format", GetArchiveRequest_Format_name, GetArchiveRequest_Format_value)
 	proto.RegisterEnum("gitaly.GetRawChangesResponse_RawChange_Operation", GetRawChangesResponse_RawChange_Operation_name, GetRawChangesResponse_RawChange_Operation_value)
 }
@@ -1324,6 +1424,8 @@ type RepositoryServiceClient interface {
 	GetSnapshot(ctx context.Context, in *GetSnapshotRequest, opts ...grpc.CallOption) (RepositoryService_GetSnapshotClient, error)
 	CreateRepositoryFromSnapshot(ctx context.Context, in *CreateRepositoryFromSnapshotRequest, opts ...grpc.CallOption) (*CreateRepositoryFromSnapshotResponse, error)
 	GetRawChanges(ctx context.Context, in *GetRawChangesRequest, opts ...grpc.CallOption) (RepositoryService_GetRawChangesClient, error)
+	SearchFilesByContent(ctx context.Context, in *SearchFilesByContentRequest, opts ...grpc.CallOption) (RepositoryService_SearchFilesByContentClient, error)
+	SearchFilesByName(ctx context.Context, in *SearchFilesByNameRequest, opts ...grpc.CallOption) (RepositoryService_SearchFilesByNameClient, error)
 }
 
 type repositoryServiceClient struct {
@@ -1726,6 +1828,70 @@ func (x *repositoryServiceGetRawChangesClient) Recv() (*GetRawChangesResponse, e
 	return m, nil
 }
 
+func (c *repositoryServiceClient) SearchFilesByContent(ctx context.Context, in *SearchFilesByContentRequest, opts ...grpc.CallOption) (RepositoryService_SearchFilesByContentClient, error) {
+	stream, err := grpc.NewClientStream(ctx, &_RepositoryService_serviceDesc.Streams[6], c.cc, "/gitaly.RepositoryService/SearchFilesByContent", opts...)
+	if err != nil {
+		return nil, err
+	}
+	x := &repositoryServiceSearchFilesByContentClient{stream}
+	if err := x.ClientStream.SendMsg(in); err != nil {
+		return nil, err
+	}
+	if err := x.ClientStream.CloseSend(); err != nil {
+		return nil, err
+	}
+	return x, nil
+}
+
+type RepositoryService_SearchFilesByContentClient interface {
+	Recv() (*SearchFilesByContentResponse, error)
+	grpc.ClientStream
+}
+
+type repositoryServiceSearchFilesByContentClient struct {
+	grpc.ClientStream
+}
+
+func (x *repositoryServiceSearchFilesByContentClient) Recv() (*SearchFilesByContentResponse, error) {
+	m := new(SearchFilesByContentResponse)
+	if err := x.ClientStream.RecvMsg(m); err != nil {
+		return nil, err
+	}
+	return m, nil
+}
+
+func (c *repositoryServiceClient) SearchFilesByName(ctx context.Context, in *SearchFilesByNameRequest, opts ...grpc.CallOption) (RepositoryService_SearchFilesByNameClient, error) {
+	stream, err := grpc.NewClientStream(ctx, &_RepositoryService_serviceDesc.Streams[7], c.cc, "/gitaly.RepositoryService/SearchFilesByName", opts...)
+	if err != nil {
+		return nil, err
+	}
+	x := &repositoryServiceSearchFilesByNameClient{stream}
+	if err := x.ClientStream.SendMsg(in); err != nil {
+		return nil, err
+	}
+	if err := x.ClientStream.CloseSend(); err != nil {
+		return nil, err
+	}
+	return x, nil
+}
+
+type RepositoryService_SearchFilesByNameClient interface {
+	Recv() (*SearchFilesByNameResponse, error)
+	grpc.ClientStream
+}
+
+type repositoryServiceSearchFilesByNameClient struct {
+	grpc.ClientStream
+}
+
+func (x *repositoryServiceSearchFilesByNameClient) Recv() (*SearchFilesByNameResponse, error) {
+	m := new(SearchFilesByNameResponse)
+	if err := x.ClientStream.RecvMsg(m); err != nil {
+		return nil, err
+	}
+	return m, nil
+}
+
 // Server API for RepositoryService service
 
 type RepositoryServiceServer interface {
@@ -1757,6 +1923,8 @@ type RepositoryServiceServer interface {
 	GetSnapshot(*GetSnapshotRequest, RepositoryService_GetSnapshotServer) error
 	CreateRepositoryFromSnapshot(context.Context, *CreateRepositoryFromSnapshotRequest) (*CreateRepositoryFromSnapshotResponse, error)
 	GetRawChanges(*GetRawChangesRequest, RepositoryService_GetRawChangesServer) error
+	SearchFilesByContent(*SearchFilesByContentRequest, RepositoryService_SearchFilesByContentServer) error
+	SearchFilesByName(*SearchFilesByNameRequest, RepositoryService_SearchFilesByNameServer) error
 }
 
 func RegisterRepositoryServiceServer(s *grpc.Server, srv RepositoryServiceServer) {
@@ -2290,6 +2458,48 @@ func (x *repositoryServiceGetRawChangesServer) Send(m *GetRawChangesResponse) er
 	return x.ServerStream.SendMsg(m)
 }
 
+func _RepositoryService_SearchFilesByContent_Handler(srv interface{}, stream grpc.ServerStream) error {
+	m := new(SearchFilesByContentRequest)
+	if err := stream.RecvMsg(m); err != nil {
+		return err
+	}
+	return srv.(RepositoryServiceServer).SearchFilesByContent(m, &repositoryServiceSearchFilesByContentServer{stream})
+}
+
+type RepositoryService_SearchFilesByContentServer interface {
+	Send(*SearchFilesByContentResponse) error
+	grpc.ServerStream
+}
+
+type repositoryServiceSearchFilesByContentServer struct {
+	grpc.ServerStream
+}
+
+func (x *repositoryServiceSearchFilesByContentServer) Send(m *SearchFilesByContentResponse) error {
+	return x.ServerStream.SendMsg(m)
+}
+
+func _RepositoryService_SearchFilesByName_Handler(srv interface{}, stream grpc.ServerStream) error {
+	m := new(SearchFilesByNameRequest)
+	if err := stream.RecvMsg(m); err != nil {
+		return err
+	}
+	return srv.(RepositoryServiceServer).SearchFilesByName(m, &repositoryServiceSearchFilesByNameServer{stream})
+}
+
+type RepositoryService_SearchFilesByNameServer interface {
+	Send(*SearchFilesByNameResponse) error
+	grpc.ServerStream
+}
+
+type repositoryServiceSearchFilesByNameServer struct {
+	grpc.ServerStream
+}
+
+func (x *repositoryServiceSearchFilesByNameServer) Send(m *SearchFilesByNameResponse) error {
+	return x.ServerStream.SendMsg(m)
+}
+
 var _RepositoryService_serviceDesc = grpc.ServiceDesc{
 	ServiceName: "gitaly.RepositoryService",
 	HandlerType: (*RepositoryServiceServer)(nil),
@@ -2414,6 +2624,16 @@ var _RepositoryService_serviceDesc = grpc.ServiceDesc{
 			Handler:       _RepositoryService_GetRawChanges_Handler,
 			ServerStreams: true,
 		},
+		{
+			StreamName:    "SearchFilesByContent",
+			Handler:       _RepositoryService_SearchFilesByContent_Handler,
+			ServerStreams: true,
+		},
+		{
+			StreamName:    "SearchFilesByName",
+			Handler:       _RepositoryService_SearchFilesByName_Handler,
+			ServerStreams: true,
+		},
 	},
 	Metadata: "repository-service.proto",
 }
@@ -2421,129 +2641,136 @@ var _RepositoryService_serviceDesc = grpc.ServiceDesc{
 func init() { proto.RegisterFile("repository-service.proto", fileDescriptor10) }
 
 var fileDescriptor10 = []byte{
-	// 1975 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x59, 0x5f, 0x6f, 0xdb, 0xc8,
-	0x11, 0x97, 0x2c, 0xff, 0x91, 0x46, 0x4a, 0x4e, 0x5e, 0x3b, 0xb1, 0xcc, 0x38, 0xb1, 0xc3, 0x04,
-	0x77, 0xbe, 0x4b, 0x6a, 0x5c, 0x9d, 0x87, 0x16, 0x68, 0x8b, 0x83, 0x2c, 0xc9, 0xb6, 0x2e, 0xf1,
-	0x9f, 0xd2, 0x0e, 0x82, 0x1a, 0x2d, 0x08, 0x9a, 0x5a, 0x99, 0x84, 0x29, 0x52, 0xb7, 0x5c, 0xc5,
-	0xe7, 0xeb, 0x6b, 0x1f, 0xfa, 0xd8, 0x7e, 0x96, 0x7e, 0x83, 0x7e, 0x81, 0x3e, 0xf4, 0xb9, 0x9f,
-	0xa0, 0x5f, 0xa2, 0xd8, 0x3f, 0xe2, 0x92, 0x22, 0xa9, 0x06, 0x60, 0x8a, 0xbe, 0x71, 0x67, 0x67,
-	0x67, 0x66, 0x67, 0x76, 0x46, 0xf3, 0x1b, 0x41, 0x8b, 0xe0, 0x71, 0x10, 0xba, 0x34, 0x20, 0xf7,
-	0x3f, 0x0b, 0x31, 0xf9, 0xe8, 0xda, 0x78, 0x6f, 0x4c, 0x02, 0x1a, 0xa0, 0xe5, 0x1b, 0x97, 0x5a,
-	0xde, 0xbd, 0xd6, 0x08, 0x1d, 0x8b, 0xe0, 0x81, 0xa0, 0xea, 0x27, 0xb0, 0x61, 0x44, 0x27, 0x7a,
-	0x3f, 0xba, 0x21, 0x0d, 0x0d, 0xfc, 0xc3, 0x04, 0x87, 0x14, 0xed, 0x03, 0x28, 0x61, 0xad, 0xf2,
-	0x4e, 0x79, 0xb7, 0xbe, 0x8f, 0xf6, 0x84, 0x94, 0x3d, 0x75, 0xc8, 0x88, 0x71, 0xe9, 0xfb, 0xd0,
-	0x4a, 0x8b, 0x0b, 0xc7, 0x81, 0x1f, 0x62, 0xf4, 0x18, 0x96, 0x31, 0xa7, 0x70, 0x59, 0x55, 0x43,
-	0xae, 0xf4, 0x53, 0x7e, 0xc6, 0xb2, 0x6f, 0xfb, 0xbe, 0x4d, 0xf0, 0x08, 0xfb, 0xd4, 0xf2, 0x8a,
-	0xd8, 0xf0, 0x04, 0x36, 0x33, 0xe4, 0x09, 0x23, 0x74, 0x0f, 0x56, 0xc5, 0xe6, 0xe1, 0xc4, 0x2b,
-	0xa2, 0x05, 0xbd, 0x80, 0x07, 0x36, 0xc1, 0x16, 0xc5, 0xe6, 0xb5, 0x4b, 0x47, 0xd6, 0xb8, 0xb5,
-	0xc0, 0x2f, 0xd5, 0x10, 0xc4, 0x03, 0x4e, 0xd3, 0xd7, 0x01, 0xc5, 0xb5, 0x49, 0x1b, 0xc6, 0xf0,
-	0xe8, 0xc8, 0x22, 0xd7, 0xd6, 0x0d, 0xee, 0x04, 0x9e, 0x87, 0x6d, 0xfa, 0x3f, 0xb7, 0xa3, 0x05,
-	0x8f, 0x67, 0x35, 0x4a, 0x5b, 0xba, 0xf0, 0xb0, 0xe3, 0x61, 0xcb, 0x9f, 0x8c, 0x8b, 0xb8, 0x7c,
-	0x15, 0xbe, 0x88, 0xa4, 0x48, 0xc1, 0x6f, 0xe1, 0x91, 0x62, 0xbe, 0x70, 0x7f, 0xc2, 0x45, 0xe4,
-	0xbf, 0x86, 0xc7, 0xb3, 0xc2, 0xe4, 0xa3, 0x42, 0xb0, 0x18, 0xba, 0x3f, 0x61, 0x2e, 0xa7, 0x62,
-	0xf0, 0x6f, 0xfd, 0x16, 0x36, 0xdb, 0xe3, 0xb1, 0x77, 0x7f, 0xe4, 0x52, 0x8b, 0x52, 0xe2, 0x5e,
-	0x4f, 0x28, 0x2e, 0xf2, 0xaa, 0x91, 0x06, 0x55, 0x82, 0x3f, 0xba, 0xa1, 0x1b, 0xf8, 0xdc, 0xbd,
-	0x0d, 0x23, 0x5a, 0xeb, 0x5b, 0xa0, 0x65, 0x29, 0x93, 0x5e, 0xf8, 0xd3, 0x02, 0xa0, 0x43, 0x4c,
-	0x6d, 0xc7, 0xc0, 0xa3, 0x80, 0x16, 0xf1, 0x01, 0x4b, 0x1f, 0xc2, 0x85, 0x70, 0x13, 0x6a, 0x86,
-	0x5c, 0xa1, 0x75, 0x58, 0x1a, 0x06, 0xc4, 0xc6, 0xad, 0x0a, 0x0f, 0xbc, 0x58, 0xa0, 0x0d, 0x58,
-	0xf1, 0x03, 0x93, 0x5a, 0x37, 0x61, 0x6b, 0x51, 0x64, 0x9b, 0x1f, 0x5c, 0x5a, 0x37, 0x21, 0x6a,
-	0xc1, 0x0a, 0x75, 0x47, 0x38, 0x98, 0xd0, 0xd6, 0xd2, 0x4e, 0x79, 0x77, 0xc9, 0x98, 0x2e, 0xd9,
-	0x91, 0x30, 0x74, 0xcc, 0x5b, 0x7c, 0xdf, 0x5a, 0x16, 0x1a, 0xc2, 0xd0, 0x79, 0x8b, 0xef, 0xd1,
-	0x36, 0xd4, 0x6f, 0xfd, 0xe0, 0xce, 0x37, 0x9d, 0x80, 0x65, 0xef, 0x0a, 0xdf, 0x04, 0x4e, 0x3a,
-	0x66, 0x14, 0xb4, 0x09, 0x55, 0x3f, 0x30, 0xc7, 0x64, 0xe2, 0xe3, 0x56, 0x8d, 0x6b, 0x5b, 0xf1,
-	0x83, 0x73, 0xb6, 0xfc, 0x7e, 0xb1, 0x5a, 0x6d, 0xd6, 0xf4, 0x47, 0xb0, 0x96, 0xf0, 0x82, 0xf4,
-	0xce, 0x09, 0x6c, 0x74, 0xf8, 0x33, 0x8d, 0x5d, 0xb9, 0xc0, 0x2b, 0xd1, 0xa0, 0x95, 0x16, 0x27,
-	0x55, 0xfd, 0xbb, 0x0c, 0xab, 0x47, 0x98, 0xb6, 0x89, 0xed, 0xb8, 0x1f, 0x0b, 0xc5, 0xe1, 0x09,
-	0xd4, 0xec, 0x60, 0x34, 0x72, 0xa9, 0xe9, 0x0e, 0x64, 0x28, 0xaa, 0x82, 0xd0, 0x1f, 0xb0, 0x20,
-	0x8d, 0x09, 0x1e, 0xba, 0x3f, 0xf2, 0x68, 0xd4, 0x0c, 0xb9, 0x42, 0xbf, 0x84, 0xe5, 0x61, 0x40,
-	0x46, 0x16, 0xe5, 0xd1, 0x78, 0xb8, 0xbf, 0x33, 0x55, 0x92, 0xb2, 0x69, 0xef, 0x90, 0xf3, 0x19,
-	0x92, 0x5f, 0x7f, 0x03, 0xcb, 0x82, 0x82, 0x56, 0xa0, 0x72, 0xd5, 0x3f, 0x6f, 0x96, 0xd8, 0xc7,
-	0x65, 0xdb, 0x68, 0x96, 0x11, 0xc0, 0xf2, 0x65, 0xdb, 0x30, 0x8f, 0xae, 0x9a, 0x0b, 0xa8, 0x0e,
-	0x2b, 0xec, 0xfb, 0xe0, 0x6a, 0xbf, 0x59, 0xd1, 0x77, 0x01, 0xc5, 0x05, 0xab, 0x5c, 0x19, 0x58,
-	0xd4, 0xe2, 0xf7, 0x6c, 0x18, 0xfc, 0x9b, 0x85, 0xe0, 0xd8, 0x0a, 0xdf, 0x05, 0xb6, 0xe5, 0x1d,
-	0x10, 0xcb, 0xb7, 0x9d, 0x42, 0x99, 0xa2, 0x7f, 0x0b, 0xad, 0xb4, 0x38, 0xa9, 0x7e, 0x1d, 0x96,
-	0x3e, 0x5a, 0xde, 0x04, 0xcb, 0xf2, 0x2f, 0x16, 0xfa, 0x3f, 0xcb, 0xd0, 0xe2, 0x6f, 0xe3, 0x22,
-	0x98, 0x10, 0x1b, 0x8b, 0x53, 0x45, 0xe2, 0xf3, 0x1d, 0xac, 0x86, 0x5c, 0x94, 0x19, 0x3b, 0xba,
-	0x90, 0x7b, 0xb4, 0x29, 0x98, 0x8d, 0x44, 0x45, 0x95, 0x02, 0xae, 0xb9, 0x31, 0x3c, 0x94, 0x0d,
-	0xa3, 0x11, 0xc6, 0x0c, 0x44, 0x4f, 0x01, 0xa8, 0x45, 0x6e, 0x30, 0x35, 0x09, 0x1e, 0xf2, 0xa0,
-	0x36, 0x8c, 0x9a, 0xa0, 0x18, 0x78, 0xa8, 0xbf, 0x81, 0xcd, 0x8c, 0x4b, 0xa9, 0x1f, 0x42, 0x82,
-	0xc3, 0x89, 0x47, 0xa7, 0x3f, 0x84, 0x62, 0xa5, 0xb7, 0xa1, 0x7e, 0x18, 0xda, 0xb7, 0x45, 0xfc,
-	0xff, 0x12, 0x1a, 0x42, 0x84, 0xf2, 0x39, 0x26, 0x24, 0x20, 0x32, 0xe6, 0x62, 0xa1, 0xff, 0xbd,
-	0x0c, 0x5f, 0x7c, 0x20, 0x2e, 0x4b, 0x94, 0x61, 0x11, 0x57, 0x37, 0xa1, 0xc2, 0x6e, 0x2f, 0x4a,
-	0x22, 0xfb, 0x4c, 0x54, 0xca, 0x4a, 0xb2, 0x52, 0xa2, 0xe7, 0xd0, 0x08, 0xbc, 0x81, 0x19, 0xed,
-	0x0b, 0xa7, 0xd5, 0x03, 0x6f, 0x60, 0x4c, 0x59, 0xa2, 0x5a, 0xb6, 0x14, 0xaf, 0x65, 0xeb, 0xb0,
-	0x14, 0x3a, 0xd8, 0xf3, 0x78, 0x59, 0xaa, 0x1a, 0x62, 0xa1, 0xef, 0x42, 0x53, 0xdd, 0x61, 0xee,
-	0x75, 0x1d, 0x58, 0x3f, 0x74, 0xfd, 0xc1, 0x09, 0x26, 0x37, 0xf8, 0xc0, 0x0a, 0x0b, 0x65, 0xff,
-	0x16, 0xd4, 0xa6, 0x17, 0x08, 0x5b, 0x0b, 0x3b, 0x15, 0x16, 0xf6, 0x88, 0xa0, 0xbf, 0x82, 0x47,
-	0x33, 0x9a, 0x54, 0xea, 0x5d, 0x5b, 0xa1, 0x78, 0xfa, 0x35, 0x83, 0x7f, 0xeb, 0x7f, 0x2e, 0xc3,
-	0xaa, 0xa8, 0x57, 0x87, 0x01, 0xb9, 0xfd, 0x7f, 0x3e, 0x79, 0xd6, 0xa7, 0xc4, 0x2d, 0x89, 0x7a,
-	0xa5, 0xcd, 0x7e, 0x68, 0x60, 0x66, 0x6c, 0xdf, 0x3f, 0x27, 0xc1, 0x0d, 0xc1, 0x61, 0x58, 0xb0,
-	0x74, 0x12, 0x2e, 0x2e, 0x56, 0x3a, 0x05, 0xa1, 0x3f, 0xd0, 0x7f, 0x03, 0x5a, 0x96, 0x36, 0xe9,
-	0xc0, 0x6d, 0xa8, 0xbb, 0xbe, 0x39, 0x96, 0x64, 0x99, 0x38, 0xe0, 0x46, 0x8c, 0xc2, 0xd8, 0x8b,
-	0x1f, 0x26, 0x56, 0xe8, 0x7c, 0x36, 0x63, 0x43, 0x2e, 0x2e, 0x66, 0xac, 0x20, 0x4c, 0x8d, 0x4d,
-	0x6b, 0xfb, 0x54, 0x63, 0x87, 0xf0, 0x6c, 0xf6, 0x97, 0xea, 0x90, 0x04, 0xa3, 0xf7, 0xc6, 0xbb,
-	0x82, 0xe9, 0x38, 0x21, 0x9e, 0xb4, 0x95, 0x7d, 0xea, 0xcf, 0x61, 0x3b, 0x57, 0x8f, 0x0c, 0x72,
-	0x1f, 0xd6, 0x04, 0xcb, 0xc1, 0xc4, 0x1f, 0x78, 0x85, 0xba, 0xb4, 0x6f, 0x60, 0x3d, 0x29, 0x6a,
-	0xce, 0xef, 0x0e, 0x06, 0xc4, 0xb3, 0xb7, 0x13, 0xf8, 0x43, 0xf7, 0xa6, 0x60, 0x9c, 0x86, 0x13,
-	0xcf, 0x33, 0xc7, 0x16, 0x75, 0xa6, 0x71, 0x62, 0x84, 0x73, 0x8b, 0x3a, 0xfa, 0x2b, 0x58, 0x4b,
-	0xa8, 0x99, 0x5b, 0x27, 0x6e, 0xe1, 0x79, 0x96, 0xb7, 0x0a, 0x3b, 0x26, 0x72, 0xc0, 0x42, 0xcc,
-	0x01, 0x2f, 0x41, 0x9f, 0xa7, 0x4c, 0x46, 0xe7, 0x18, 0x10, 0x2b, 0x28, 0xef, 0x5c, 0x1b, 0xfb,
-	0x85, 0x0a, 0x97, 0xde, 0x81, 0xb5, 0x84, 0x24, 0xe9, 0x89, 0xd7, 0x80, 0x3c, 0x41, 0x32, 0x43,
-	0x27, 0x20, 0xd4, 0xf4, 0xad, 0xd1, 0xb4, 0x4c, 0x35, 0xe5, 0xce, 0x05, 0xdb, 0x38, 0xb5, 0x46,
-	0x98, 0x41, 0xb5, 0x23, 0x4c, 0xfb, 0xfe, 0x30, 0x68, 0x7f, 0x8e, 0xc6, 0x5a, 0xff, 0x15, 0x6c,
-	0x66, 0xc8, 0x93, 0xa6, 0x3d, 0x03, 0x50, 0x1d, 0xb5, 0x8c, 0x54, 0x8c, 0xc2, 0x8c, 0xe9, 0x58,
-	0x9e, 0x3d, 0xf1, 0x2c, 0x8a, 0x3b, 0x0e, 0xb6, 0x6f, 0xc3, 0xc9, 0xa8, 0x88, 0x31, 0xbf, 0x80,
-	0xcd, 0x0c, 0x79, 0xd2, 0x18, 0x0d, 0xaa, 0xb6, 0xa4, 0x49, 0xef, 0x44, 0x6b, 0x16, 0xa4, 0x23,
-	0x4c, 0x2f, 0x7c, 0x6b, 0x1c, 0x3a, 0x41, 0x11, 0x30, 0xa7, 0x7f, 0x0d, 0x6b, 0x09, 0x49, 0x73,
-	0x12, 0xe8, 0xaf, 0x65, 0x78, 0x91, 0xf5, 0x80, 0x3e, 0x83, 0x19, 0xac, 0x9f, 0x77, 0x28, 0x1d,
-	0x9b, 0xaa, 0x9a, 0xac, 0xb0, 0xf5, 0x7b, 0xe2, 0xb1, 0x6c, 0xe3, 0x5b, 0xd6, 0x84, 0x3a, 0xb2,
-	0xc7, 0xe5, 0xbc, 0xed, 0x09, 0x75, 0xf4, 0x2f, 0xe1, 0xe5, 0x7c, 0x93, 0xe4, 0xab, 0xfe, 0x4b,
-	0x19, 0xd6, 0x8f, 0x30, 0x35, 0xac, 0xbb, 0x8e, 0x63, 0xf9, 0x37, 0xc5, 0xc0, 0xd9, 0x0b, 0x78,
-	0x30, 0x24, 0xc1, 0xc8, 0x4c, 0x20, 0xb4, 0x9a, 0xd1, 0x60, 0xc4, 0xa8, 0xb1, 0xd8, 0x86, 0x3a,
-	0x0d, 0xcc, 0x44, 0x6b, 0x52, 0x33, 0x80, 0x06, 0x53, 0x06, 0xfd, 0x6f, 0x15, 0x78, 0x34, 0x63,
-	0x92, 0x74, 0xfe, 0x31, 0xd4, 0x89, 0x75, 0x67, 0xda, 0x82, 0xdc, 0x2a, 0xef, 0x54, 0x76, 0xeb,
-	0xfb, 0x5f, 0xc5, 0xfa, 0xf7, 0xf4, 0x99, 0xbd, 0x88, 0x64, 0x00, 0x89, 0x76, 0xb5, 0x7f, 0x2c,
-	0x40, 0x2d, 0xda, 0x61, 0x70, 0xeb, 0xda, 0x0b, 0xae, 0xd9, 0xaf, 0x8b, 0x78, 0x50, 0xcb, 0x6c,
-	0xd9, 0x1f, 0x44, 0x90, 0x76, 0x41, 0x41, 0x5a, 0x8e, 0xb0, 0xf0, 0x9d, 0xa8, 0x71, 0xc2, 0xf8,
-	0x15, 0x1f, 0xdf, 0xb1, 0x12, 0xc7, 0xb6, 0x58, 0x5b, 0xc5, 0xb7, 0x16, 0xc5, 0x56, 0xe0, 0x0d,
-	0xf8, 0xd6, 0x19, 0xd4, 0x82, 0x31, 0x26, 0x16, 0x65, 0x77, 0x5e, 0xe2, 0xc0, 0xe3, 0xe7, 0x9f,
-	0x68, 0xf8, 0xde, 0xd9, 0xf4, 0xa0, 0xa1, 0x64, 0x30, 0x5f, 0x33, 0x5f, 0x28, 0xa1, 0x02, 0x28,
-	0x36, 0x88, 0x75, 0x17, 0xf1, 0xeb, 0x2e, 0xd4, 0xa2, 0x05, 0x83, 0x25, 0xef, 0x4f, 0xdf, 0x9e,
-	0x9e, 0x7d, 0x38, 0x6d, 0x96, 0x50, 0x0d, 0x96, 0xda, 0xdd, 0x6e, 0xaf, 0x2b, 0xa0, 0x4b, 0xe7,
-	0xec, 0xbc, 0xdf, 0xeb, 0x0a, 0xe8, 0xd2, 0xed, 0xbd, 0xeb, 0x5d, 0xf6, 0xba, 0xcd, 0x0a, 0x6a,
-	0x40, 0xf5, 0xe4, 0xac, 0xdb, 0x3f, 0x64, 0x5b, 0x8b, 0x6c, 0xcb, 0xe8, 0x9d, 0xb6, 0x4f, 0x7a,
-	0xdd, 0xe6, 0x12, 0x6a, 0x42, 0xe3, 0xf2, 0x77, 0xe7, 0x3d, 0xb3, 0x73, 0xdc, 0x3e, 0x3d, 0xea,
-	0x75, 0x9b, 0xcb, 0xfb, 0xff, 0x42, 0x7c, 0x9c, 0x33, 0x1d, 0x0c, 0x88, 0x79, 0x17, 0xfa, 0x00,
-	0xcd, 0xd9, 0x21, 0x14, 0xda, 0x4e, 0xbf, 0xa2, 0xc4, 0xb4, 0x4b, 0xdb, 0xc9, 0x67, 0x90, 0xaf,
-	0xb6, 0x84, 0xae, 0xa6, 0xc3, 0xa3, 0xd8, 0x64, 0x09, 0xc5, 0x0f, 0x66, 0x0e, 0xb1, 0xb4, 0xe7,
-	0x73, 0x38, 0x22, 0xd9, 0x3d, 0x00, 0x35, 0x2a, 0x42, 0x9b, 0xc9, 0x23, 0xb1, 0x61, 0x95, 0xa6,
-	0x65, 0x6d, 0x45, 0x62, 0x7e, 0x0b, 0x0f, 0x93, 0x93, 0x1e, 0xf4, 0x34, 0x8a, 0x78, 0xd6, 0xcc,
-	0x49, 0x7b, 0x96, 0xb7, 0x1d, 0x17, 0x99, 0x1c, 0xbe, 0x28, 0x91, 0x99, 0x13, 0x1e, 0x25, 0x32,
-	0x7b, 0x66, 0xa3, 0x97, 0xd0, 0x1f, 0x00, 0xa5, 0x87, 0x26, 0x28, 0xf2, 0x53, 0xee, 0xf4, 0x46,
-	0xd3, 0xe7, 0xb1, 0x44, 0xe2, 0x8f, 0xa1, 0x1e, 0x1b, 0x37, 0xa0, 0xc8, 0x63, 0xe9, 0x49, 0x8c,
-	0xf6, 0x24, 0x73, 0x2f, 0x92, 0xf4, 0x01, 0x9a, 0xb3, 0x15, 0x4d, 0x3d, 0xa5, 0x9c, 0xd9, 0x85,
-	0x7a, 0x4a, 0xb9, 0xd3, 0x88, 0x12, 0x3a, 0x02, 0x50, 0x08, 0x5d, 0x85, 0x3b, 0x35, 0x0e, 0x50,
-	0xe1, 0x4e, 0x03, 0x7a, 0xbd, 0xf4, 0x6d, 0x99, 0x59, 0x38, 0x8b, 0xb8, 0x95, 0x85, 0x39, 0xd0,
-	0x5e, 0x59, 0x98, 0x07, 0xd6, 0xc5, 0x63, 0x4f, 0x41, 0x58, 0xf5, 0xd8, 0xf3, 0x20, 0xbb, 0x7a,
-	0xec, 0xb9, 0xf8, 0x57, 0x2f, 0xa1, 0x37, 0xb0, 0xc8, 0x60, 0x2a, 0x5a, 0x8b, 0x98, 0x15, 0xee,
-	0xd5, 0xd6, 0x93, 0xc4, 0xe8, 0xd0, 0x77, 0x50, 0x9d, 0x02, 0x3e, 0xb4, 0x31, 0xe5, 0x99, 0x81,
-	0xb1, 0x5a, 0x2b, 0xbd, 0x11, 0x09, 0x38, 0x85, 0x07, 0x09, 0x74, 0x86, 0xb6, 0x22, 0x4d, 0x19,
-	0xf0, 0x50, 0x7b, 0x9a, 0xb3, 0x1b, 0x4f, 0x59, 0x85, 0x9a, 0x54, 0x0c, 0x53, 0x98, 0x4e, 0xc5,
-	0x30, 0x03, 0x64, 0xf1, 0x64, 0x48, 0x03, 0x1f, 0x95, 0x0c, 0xb9, 0x10, 0x4c, 0x25, 0x43, 0x3e,
-	0x6e, 0x9a, 0x8a, 0x9f, 0x85, 0x2a, 0x71, 0xf1, 0x39, 0xa0, 0x29, 0x2e, 0x3e, 0x0f, 0xe9, 0xe8,
-	0x25, 0xe4, 0xa5, 0x67, 0x78, 0x12, 0x62, 0xa0, 0x2f, 0xf3, 0xf2, 0x20, 0x89, 0x75, 0xb4, 0xaf,
-	0xfe, 0x2b, 0x5f, 0xa4, 0xed, 0x04, 0x1a, 0x71, 0x88, 0x81, 0x9e, 0x24, 0x8f, 0x26, 0x5a, 0x75,
-	0x6d, 0x2b, 0x7b, 0x33, 0x96, 0x3c, 0x77, 0xa0, 0xe5, 0x37, 0xe1, 0xe8, 0xeb, 0x79, 0x76, 0x25,
-	0x55, 0x7d, 0xf3, 0x29, 0xac, 0x53, 0xc5, 0xbb, 0x65, 0x56, 0xa1, 0x62, 0xb8, 0x44, 0x55, 0xa8,
-	0x34, 0x26, 0x52, 0x15, 0x2a, 0x03, 0xc8, 0xc8, 0x5a, 0xa7, 0xfa, 0xfa, 0x58, 0xad, 0x4b, 0xc1,
-	0x86, 0x58, 0xad, 0x4b, 0x03, 0x01, 0xbd, 0x84, 0x7e, 0xcf, 0x27, 0xa4, 0xc9, 0x66, 0x1c, 0xc5,
-	0x07, 0x95, 0x99, 0x7d, 0xbf, 0x4a, 0xf8, 0xdc, 0x4e, 0x9e, 0xbb, 0xfa, 0x0a, 0x56, 0x53, 0xdd,
-	0xb5, 0x92, 0x9e, 0xd7, 0xc8, 0x2b, 0xe9, 0xb9, 0xad, 0xb9, 0x5e, 0x42, 0xbf, 0x86, 0x15, 0xf9,
-	0xf7, 0x03, 0x7a, 0x1c, 0xf1, 0x27, 0xfe, 0xd5, 0xd0, 0x36, 0x52, 0xf4, 0xe8, 0xf4, 0xf7, 0x50,
-	0x8f, 0x35, 0xdd, 0x28, 0x5e, 0x70, 0x67, 0x9a, 0x69, 0xe5, 0xc1, 0x8c, 0x2e, 0x9d, 0xdf, 0xf2,
-	0x8f, 0xb0, 0x35, 0xaf, 0x03, 0x46, 0xaf, 0xe6, 0xbd, 0x93, 0x59, 0x6d, 0xaf, 0x3f, 0x8d, 0x39,
-	0xba, 0xc8, 0x39, 0x3c, 0x48, 0x74, 0x75, 0xaa, 0xbe, 0x65, 0x35, 0xdb, 0xaa, 0xbe, 0x65, 0xb6,
-	0x82, 0xec, 0x3a, 0xd7, 0xcb, 0xfc, 0x4f, 0xc2, 0x37, 0xff, 0x09, 0x00, 0x00, 0xff, 0xff, 0x0a,
-	0x07, 0x23, 0x8a, 0x56, 0x1c, 0x00, 0x00,
+	// 2096 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x59, 0xef, 0x6e, 0xdb, 0xc8,
+	0x11, 0x97, 0x2c, 0xcb, 0x92, 0x46, 0xca, 0x9d, 0xbc, 0x96, 0x63, 0x99, 0x76, 0x62, 0x87, 0x09,
+	0xee, 0x7c, 0x97, 0xd4, 0xb8, 0x73, 0x3e, 0xf4, 0x80, 0xb6, 0x38, 0xc8, 0xfa, 0x63, 0xeb, 0x12,
+	0xff, 0x29, 0xed, 0x20, 0xa8, 0x71, 0x85, 0x40, 0x53, 0x2b, 0x93, 0x30, 0x45, 0x2a, 0xcb, 0x95,
+	0x7d, 0xbe, 0x7e, 0xed, 0x87, 0x7e, 0x6c, 0x5f, 0xa1, 0xaf, 0xd0, 0x37, 0xe8, 0x0b, 0xf4, 0x43,
+	0x1f, 0xa3, 0x2f, 0x51, 0xec, 0x72, 0xc5, 0x25, 0x45, 0x52, 0x0d, 0xc0, 0xb4, 0xfd, 0xa6, 0x9d,
+	0x9d, 0x9d, 0x99, 0x9d, 0xd9, 0x19, 0xce, 0x6f, 0x04, 0x4d, 0x82, 0x27, 0xae, 0x67, 0x51, 0x97,
+	0x3c, 0xfc, 0xc2, 0xc3, 0xe4, 0xce, 0x32, 0xf0, 0xfe, 0x84, 0xb8, 0xd4, 0x45, 0x2b, 0x37, 0x16,
+	0xd5, 0xed, 0x07, 0xa5, 0xe6, 0x99, 0x3a, 0xc1, 0x43, 0x9f, 0xaa, 0x9e, 0xc0, 0x86, 0x16, 0x9c,
+	0xe8, 0xfe, 0x64, 0x79, 0xd4, 0xd3, 0xf0, 0x87, 0x29, 0xf6, 0x28, 0x3a, 0x00, 0x90, 0xc2, 0x9a,
+	0xf9, 0xdd, 0xfc, 0x5e, 0xf5, 0x00, 0xed, 0xfb, 0x52, 0xf6, 0xe5, 0x21, 0x2d, 0xc4, 0xa5, 0x1e,
+	0x40, 0x33, 0x2e, 0xce, 0x9b, 0xb8, 0x8e, 0x87, 0xd1, 0x63, 0x58, 0xc1, 0x9c, 0xc2, 0x65, 0x95,
+	0x35, 0xb1, 0x52, 0x4f, 0xf9, 0x19, 0xdd, 0xb8, 0xed, 0x3b, 0x06, 0xc1, 0x63, 0xec, 0x50, 0xdd,
+	0xce, 0x62, 0xc3, 0x16, 0x6c, 0x26, 0xc8, 0xf3, 0x8d, 0x50, 0x6d, 0x58, 0xf5, 0x37, 0x7b, 0x53,
+	0x3b, 0x8b, 0x16, 0xf4, 0x1c, 0x1e, 0x19, 0x04, 0xeb, 0x14, 0x0f, 0xae, 0x2d, 0x3a, 0xd6, 0x27,
+	0xcd, 0x25, 0x7e, 0xa9, 0x9a, 0x4f, 0x3c, 0xe4, 0x34, 0xb5, 0x01, 0x28, 0xac, 0x4d, 0xd8, 0x30,
+	0x81, 0xf5, 0x23, 0x9d, 0x5c, 0xeb, 0x37, 0xb8, 0xed, 0xda, 0x36, 0x36, 0xe8, 0x7f, 0xdd, 0x8e,
+	0x26, 0x3c, 0x9e, 0xd7, 0x28, 0x6c, 0xe9, 0xc0, 0x67, 0x6d, 0x1b, 0xeb, 0xce, 0x74, 0x92, 0xc5,
+	0xe5, 0xab, 0xf0, 0x79, 0x20, 0x45, 0x08, 0x7e, 0x03, 0xeb, 0x92, 0xf9, 0xc2, 0xfa, 0x19, 0x67,
+	0x91, 0xff, 0x0a, 0x1e, 0xcf, 0x0b, 0x13, 0x8f, 0x0a, 0xc1, 0xb2, 0x67, 0xfd, 0x8c, 0xb9, 0x9c,
+	0x82, 0xc6, 0x7f, 0xab, 0xb7, 0xb0, 0xd9, 0x9a, 0x4c, 0xec, 0x87, 0x23, 0x8b, 0xea, 0x94, 0x12,
+	0xeb, 0x7a, 0x4a, 0x71, 0x96, 0x57, 0x8d, 0x14, 0x28, 0x13, 0x7c, 0x67, 0x79, 0x96, 0xeb, 0x70,
+	0xf7, 0xd6, 0xb4, 0x60, 0xad, 0x6e, 0x83, 0x92, 0xa4, 0x4c, 0x78, 0xe1, 0x8f, 0x4b, 0x80, 0x7a,
+	0x98, 0x1a, 0xa6, 0x86, 0xc7, 0x2e, 0xcd, 0xe2, 0x03, 0x96, 0x3e, 0x84, 0x0b, 0xe1, 0x26, 0x54,
+	0x34, 0xb1, 0x42, 0x0d, 0x28, 0x8e, 0x5c, 0x62, 0xe0, 0x66, 0x81, 0x07, 0xde, 0x5f, 0xa0, 0x0d,
+	0x28, 0x39, 0xee, 0x80, 0xea, 0x37, 0x5e, 0x73, 0xd9, 0xcf, 0x36, 0xc7, 0xbd, 0xd4, 0x6f, 0x3c,
+	0xd4, 0x84, 0x12, 0xb5, 0xc6, 0xd8, 0x9d, 0xd2, 0x66, 0x71, 0x37, 0xbf, 0x57, 0xd4, 0x66, 0x4b,
+	0x76, 0xc4, 0xf3, 0xcc, 0xc1, 0x2d, 0x7e, 0x68, 0xae, 0xf8, 0x1a, 0x3c, 0xcf, 0x7c, 0x83, 0x1f,
+	0xd0, 0x0e, 0x54, 0x6f, 0x1d, 0xf7, 0xde, 0x19, 0x98, 0x2e, 0xcb, 0xde, 0x12, 0xdf, 0x04, 0x4e,
+	0x3a, 0x66, 0x14, 0xb4, 0x09, 0x65, 0xc7, 0x1d, 0x4c, 0xc8, 0xd4, 0xc1, 0xcd, 0x0a, 0xd7, 0x56,
+	0x72, 0xdc, 0x73, 0xb6, 0xfc, 0x61, 0xb9, 0x5c, 0xae, 0x57, 0xd4, 0x75, 0x58, 0x8b, 0x78, 0x41,
+	0x78, 0xe7, 0x04, 0x36, 0xda, 0xfc, 0x99, 0x86, 0xae, 0x9c, 0xe1, 0x95, 0x28, 0xd0, 0x8c, 0x8b,
+	0x13, 0xaa, 0xfe, 0x95, 0x87, 0xd5, 0x23, 0x4c, 0x5b, 0xc4, 0x30, 0xad, 0xbb, 0x4c, 0x71, 0xd8,
+	0x82, 0x8a, 0xe1, 0x8e, 0xc7, 0x16, 0x1d, 0x58, 0x43, 0x11, 0x8a, 0xb2, 0x4f, 0xe8, 0x0f, 0x59,
+	0x90, 0x26, 0x04, 0x8f, 0xac, 0x9f, 0x78, 0x34, 0x2a, 0x9a, 0x58, 0xa1, 0xef, 0x60, 0x65, 0xe4,
+	0x92, 0xb1, 0x4e, 0x79, 0x34, 0x3e, 0x3b, 0xd8, 0x9d, 0x29, 0x89, 0xd9, 0xb4, 0xdf, 0xe3, 0x7c,
+	0x9a, 0xe0, 0x57, 0x5f, 0xc3, 0x8a, 0x4f, 0x41, 0x25, 0x28, 0x5c, 0xf5, 0xcf, 0xeb, 0x39, 0xf6,
+	0xe3, 0xb2, 0xa5, 0xd5, 0xf3, 0x08, 0x60, 0xe5, 0xb2, 0xa5, 0x0d, 0x8e, 0xae, 0xea, 0x4b, 0xa8,
+	0x0a, 0x25, 0xf6, 0xfb, 0xf0, 0xea, 0xa0, 0x5e, 0x50, 0xf7, 0x00, 0x85, 0x05, 0xcb, 0x5c, 0x19,
+	0xea, 0x54, 0xe7, 0xf7, 0xac, 0x69, 0xfc, 0x37, 0x0b, 0xc1, 0xb1, 0xee, 0xbd, 0x75, 0x0d, 0xdd,
+	0x3e, 0x24, 0xba, 0x63, 0x98, 0x99, 0x32, 0x45, 0xfd, 0x06, 0x9a, 0x71, 0x71, 0x42, 0x7d, 0x03,
+	0x8a, 0x77, 0xba, 0x3d, 0xc5, 0xa2, 0xfc, 0xfb, 0x0b, 0xf5, 0x9f, 0x79, 0x68, 0xf2, 0xb7, 0x71,
+	0xe1, 0x4e, 0x89, 0x81, 0xfd, 0x53, 0x59, 0xe2, 0xf3, 0x3d, 0xac, 0x7a, 0x5c, 0xd4, 0x20, 0x74,
+	0x74, 0x29, 0xf5, 0x68, 0xdd, 0x67, 0xd6, 0x22, 0x15, 0x55, 0x08, 0xb8, 0xe6, 0xc6, 0xf0, 0x50,
+	0xd6, 0xb4, 0x9a, 0x17, 0x32, 0x10, 0x3d, 0x01, 0xa0, 0x3a, 0xb9, 0xc1, 0x74, 0x40, 0xf0, 0x88,
+	0x07, 0xb5, 0xa6, 0x55, 0x7c, 0x8a, 0x86, 0x47, 0xea, 0x6b, 0xd8, 0x4c, 0xb8, 0x94, 0xfc, 0x10,
+	0x12, 0xec, 0x4d, 0x6d, 0x3a, 0xfb, 0x10, 0xfa, 0x2b, 0xb5, 0x05, 0xd5, 0x9e, 0x67, 0xdc, 0x66,
+	0xf1, 0xff, 0x0b, 0xa8, 0xf9, 0x22, 0xa4, 0xcf, 0x31, 0x21, 0x2e, 0x11, 0x31, 0xf7, 0x17, 0xea,
+	0xdf, 0xf3, 0xf0, 0xf9, 0x7b, 0x62, 0xb1, 0x44, 0x19, 0x65, 0x71, 0x75, 0x1d, 0x0a, 0xec, 0xf6,
+	0x7e, 0x49, 0x64, 0x3f, 0x23, 0x95, 0xb2, 0x10, 0xad, 0x94, 0xe8, 0x19, 0xd4, 0x5c, 0x7b, 0x38,
+	0x08, 0xf6, 0x7d, 0xa7, 0x55, 0x5d, 0x7b, 0xa8, 0xcd, 0x58, 0x82, 0x5a, 0x56, 0x0c, 0xd7, 0xb2,
+	0x06, 0x14, 0x3d, 0x13, 0xdb, 0x36, 0x2f, 0x4b, 0x65, 0xcd, 0x5f, 0xa8, 0x7b, 0x50, 0x97, 0x77,
+	0x58, 0x78, 0x5d, 0x13, 0x1a, 0x3d, 0xcb, 0x19, 0x9e, 0x60, 0x72, 0x83, 0x0f, 0x75, 0x2f, 0x53,
+	0xf6, 0x6f, 0x43, 0x65, 0x76, 0x01, 0xaf, 0xb9, 0xb4, 0x5b, 0x60, 0x61, 0x0f, 0x08, 0xea, 0x4b,
+	0x58, 0x9f, 0xd3, 0x24, 0x53, 0xef, 0x5a, 0xf7, 0xfc, 0xa7, 0x5f, 0xd1, 0xf8, 0x6f, 0xf5, 0x4f,
+	0x79, 0x58, 0xf5, 0xeb, 0x55, 0xcf, 0x25, 0xb7, 0xff, 0xcf, 0x27, 0xcf, 0xfa, 0x94, 0xb0, 0x25,
+	0x41, 0xaf, 0xb4, 0xd9, 0xf7, 0x34, 0xcc, 0x8c, 0xed, 0x3b, 0xe7, 0xc4, 0xbd, 0x21, 0xd8, 0xf3,
+	0x32, 0x96, 0x4e, 0xc2, 0xc5, 0x85, 0x4a, 0xa7, 0x4f, 0xe8, 0x0f, 0xd5, 0xdf, 0x80, 0x92, 0xa4,
+	0x4d, 0x38, 0x70, 0x07, 0xaa, 0x96, 0x33, 0x98, 0x08, 0xb2, 0x48, 0x1c, 0xb0, 0x02, 0x46, 0xdf,
+	0xd8, 0x8b, 0x0f, 0x53, 0xdd, 0x33, 0x3f, 0x99, 0xb1, 0x1e, 0x17, 0x17, 0x32, 0xd6, 0x27, 0xcc,
+	0x8c, 0x8d, 0x6b, 0xfb, 0x58, 0x63, 0x47, 0xf0, 0x74, 0xfe, 0x4b, 0xd5, 0x23, 0xee, 0xf8, 0x9d,
+	0xf6, 0x36, 0x63, 0x3a, 0x4e, 0x89, 0x2d, 0x6c, 0x65, 0x3f, 0xd5, 0x67, 0xb0, 0x93, 0xaa, 0x47,
+	0x04, 0xb9, 0x0f, 0x6b, 0x3e, 0xcb, 0xe1, 0xd4, 0x19, 0xda, 0x99, 0xba, 0xb4, 0xaf, 0xa1, 0x11,
+	0x15, 0xb5, 0xe0, 0xbb, 0x83, 0x01, 0xf1, 0xec, 0x6d, 0xbb, 0xce, 0xc8, 0xba, 0xc9, 0x18, 0xa7,
+	0xd1, 0xd4, 0xb6, 0x07, 0x13, 0x9d, 0x9a, 0xb3, 0x38, 0x31, 0xc2, 0xb9, 0x4e, 0x4d, 0xf5, 0x25,
+	0xac, 0x45, 0xd4, 0x2c, 0xac, 0x13, 0xb7, 0xf0, 0x2c, 0xc9, 0x5b, 0x99, 0x1d, 0x13, 0x38, 0x60,
+	0x29, 0xe4, 0x80, 0x17, 0xa0, 0x2e, 0x52, 0x26, 0xa2, 0x73, 0x0c, 0x88, 0x15, 0x94, 0xb7, 0x96,
+	0x81, 0x9d, 0x4c, 0x85, 0x4b, 0x6d, 0xc3, 0x5a, 0x44, 0x92, 0xf0, 0xc4, 0x2b, 0x40, 0xb6, 0x4f,
+	0x1a, 0x78, 0xa6, 0x4b, 0xe8, 0xc0, 0xd1, 0xc7, 0xb3, 0x32, 0x55, 0x17, 0x3b, 0x17, 0x6c, 0xe3,
+	0x54, 0x1f, 0x63, 0x06, 0xd5, 0x8e, 0x30, 0xed, 0x3b, 0x23, 0xb7, 0xf5, 0x29, 0x1a, 0x6b, 0xf5,
+	0x57, 0xb0, 0x99, 0x20, 0x4f, 0x98, 0xf6, 0x14, 0x40, 0x76, 0xd4, 0x22, 0x52, 0x21, 0x0a, 0x33,
+	0xa6, 0xad, 0xdb, 0xc6, 0xd4, 0xd6, 0x29, 0x6e, 0x9b, 0xd8, 0xb8, 0xf5, 0xa6, 0xe3, 0x2c, 0xc6,
+	0xfc, 0x12, 0x36, 0x13, 0xe4, 0x09, 0x63, 0x14, 0x28, 0x1b, 0x82, 0x26, 0xbc, 0x13, 0xac, 0x59,
+	0x90, 0x8e, 0x30, 0xbd, 0x70, 0xf4, 0x89, 0x67, 0xba, 0x59, 0xc0, 0x9c, 0xfa, 0x15, 0xac, 0x45,
+	0x24, 0x2d, 0x48, 0xa0, 0xbf, 0xe4, 0xe1, 0x79, 0xd2, 0x03, 0xfa, 0x04, 0x66, 0xb0, 0x7e, 0xde,
+	0xa4, 0x74, 0x32, 0x90, 0xd5, 0xa4, 0xc4, 0xd6, 0xef, 0x88, 0xcd, 0xb2, 0x8d, 0x6f, 0xe9, 0x53,
+	0x6a, 0x8a, 0x1e, 0x97, 0xf3, 0xb6, 0xa6, 0xd4, 0x54, 0xbf, 0x80, 0x17, 0x8b, 0x4d, 0x12, 0xaf,
+	0xfa, 0xcf, 0x79, 0x68, 0x1c, 0x61, 0xaa, 0xe9, 0xf7, 0x6d, 0x53, 0x77, 0x6e, 0xb2, 0x81, 0xb3,
+	0xe7, 0xf0, 0x68, 0x44, 0xdc, 0xf1, 0x20, 0x82, 0xd0, 0x2a, 0x5a, 0x8d, 0x11, 0x83, 0xc6, 0x62,
+	0x07, 0xaa, 0xd4, 0x1d, 0x44, 0x5a, 0x93, 0x8a, 0x06, 0xd4, 0x9d, 0x31, 0xa8, 0x7f, 0x2b, 0xc0,
+	0xfa, 0x9c, 0x49, 0xc2, 0xf9, 0xc7, 0x50, 0x25, 0xfa, 0xfd, 0xc0, 0xf0, 0xc9, 0xcd, 0xfc, 0x6e,
+	0x61, 0xaf, 0x7a, 0xf0, 0x65, 0xa8, 0x7f, 0x8f, 0x9f, 0xd9, 0x0f, 0x48, 0x1a, 0x90, 0x60, 0x57,
+	0xf9, 0xc7, 0x12, 0x54, 0x82, 0x1d, 0x06, 0xb7, 0xae, 0x6d, 0xf7, 0x9a, 0x7d, 0x5d, 0xfc, 0x07,
+	0xb5, 0xc2, 0x96, 0xfd, 0x61, 0x00, 0x69, 0x97, 0x24, 0xa4, 0xe5, 0x08, 0x0b, 0xdf, 0xfb, 0x35,
+	0xce, 0x37, 0xbe, 0xe4, 0xe0, 0x7b, 0x56, 0xe2, 0xd8, 0x16, 0x6b, 0xab, 0xf8, 0xd6, 0xb2, 0xbf,
+	0xe5, 0xda, 0x43, 0xbe, 0x75, 0x06, 0x15, 0x77, 0x82, 0x89, 0x4e, 0xd9, 0x9d, 0x8b, 0x1c, 0x78,
+	0x7c, 0xfb, 0x91, 0x86, 0xef, 0x9f, 0xcd, 0x0e, 0x6a, 0x52, 0x06, 0xf3, 0x35, 0xf3, 0x85, 0x14,
+	0xea, 0x03, 0xc5, 0x1a, 0xd1, 0xef, 0x03, 0x7e, 0xd5, 0x82, 0x4a, 0xb0, 0x60, 0xb0, 0xe4, 0xdd,
+	0xe9, 0x9b, 0xd3, 0xb3, 0xf7, 0xa7, 0xf5, 0x1c, 0xaa, 0x40, 0xb1, 0xd5, 0xe9, 0x74, 0x3b, 0x3e,
+	0x74, 0x69, 0x9f, 0x9d, 0xf7, 0xbb, 0x1d, 0x1f, 0xba, 0x74, 0xba, 0x6f, 0xbb, 0x97, 0xdd, 0x4e,
+	0xbd, 0x80, 0x6a, 0x50, 0x3e, 0x39, 0xeb, 0xf4, 0x7b, 0x6c, 0x6b, 0x99, 0x6d, 0x69, 0xdd, 0xd3,
+	0xd6, 0x49, 0xb7, 0x53, 0x2f, 0xa2, 0x3a, 0xd4, 0x2e, 0x7f, 0x77, 0xde, 0x1d, 0xb4, 0x8f, 0x5b,
+	0xa7, 0x47, 0xdd, 0x4e, 0x7d, 0x45, 0xbd, 0x83, 0xe6, 0x05, 0xd6, 0x89, 0x61, 0xf6, 0x2c, 0x1b,
+	0x7b, 0x87, 0x0f, 0xac, 0x48, 0x65, 0x79, 0x4b, 0x0d, 0x28, 0x7e, 0x98, 0x62, 0xd1, 0x3c, 0x55,
+	0x34, 0x7f, 0x31, 0x6b, 0x73, 0x0b, 0x41, 0x9b, 0xab, 0x7e, 0x0b, 0x9b, 0x09, 0x7a, 0xe5, 0xc7,
+	0x65, 0xc4, 0xc8, 0xfc, 0xa9, 0xd4, 0x34, 0x7f, 0xa1, 0x3e, 0xc0, 0x56, 0xe4, 0x48, 0xdb, 0x75,
+	0x28, 0x76, 0xe8, 0xff, 0xc2, 0xda, 0xef, 0x60, 0x3b, 0x59, 0xb5, 0x30, 0xb8, 0x09, 0xa5, 0xb1,
+	0x4e, 0x19, 0x56, 0x13, 0x26, 0xcf, 0x96, 0x07, 0x7f, 0x6d, 0xf0, 0x71, 0xd9, 0x6c, 0xf0, 0xe2,
+	0xcf, 0x13, 0xd1, 0x7b, 0xa8, 0xcf, 0x0f, 0xf9, 0xd0, 0x4e, 0xdc, 0xd6, 0xc8, 0x34, 0x51, 0xd9,
+	0x4d, 0x67, 0x10, 0x55, 0x21, 0x87, 0xae, 0x66, 0xc3, 0xb9, 0xd0, 0xe4, 0x0e, 0x85, 0x0f, 0x26,
+	0x0e, 0x09, 0x95, 0x67, 0x0b, 0x38, 0x02, 0xd9, 0x5d, 0x00, 0x39, 0x8a, 0x43, 0x9b, 0xd1, 0x23,
+	0xa1, 0x61, 0xa0, 0xa2, 0x24, 0x6d, 0x05, 0x62, 0x7e, 0x0b, 0x9f, 0x45, 0x27, 0x69, 0xe8, 0x49,
+	0x90, 0x51, 0x49, 0x33, 0x3d, 0xe5, 0x69, 0xda, 0x76, 0x58, 0x64, 0x74, 0xb8, 0x25, 0x45, 0x26,
+	0x4e, 0xd0, 0xa4, 0xc8, 0xe4, 0x99, 0x98, 0x9a, 0x43, 0xbf, 0x07, 0x14, 0x1f, 0x4a, 0xa1, 0xc0,
+	0x4f, 0xa9, 0xd3, 0x31, 0x45, 0x5d, 0xc4, 0x12, 0x88, 0x3f, 0x86, 0x6a, 0x68, 0x9c, 0x83, 0x02,
+	0x8f, 0xc5, 0x27, 0x5d, 0xca, 0x56, 0xe2, 0x5e, 0x20, 0xe9, 0x3d, 0xd4, 0xe7, 0xbf, 0x18, 0xf2,
+	0x29, 0xa5, 0xcc, 0x86, 0xe4, 0x53, 0x4a, 0x9d, 0xf6, 0xe4, 0xd0, 0x11, 0x80, 0x9c, 0x80, 0xc8,
+	0x70, 0xc7, 0xc6, 0x2d, 0x32, 0xdc, 0xf1, 0x81, 0x89, 0x9a, 0xfb, 0x26, 0xcf, 0x2c, 0x9c, 0x9f,
+	0x68, 0x48, 0x0b, 0x53, 0x46, 0x27, 0xd2, 0xc2, 0xb4, 0x61, 0x88, 0xff, 0xd8, 0x63, 0x23, 0x02,
+	0xf9, 0xd8, 0xd3, 0x46, 0x22, 0xf2, 0xb1, 0xa7, 0xce, 0x17, 0xd4, 0x1c, 0x7a, 0x0d, 0xcb, 0x3d,
+	0xcf, 0xb8, 0x45, 0x6b, 0x01, 0xb3, 0x9c, 0x2b, 0x28, 0x8d, 0x28, 0x31, 0x38, 0xf4, 0x3d, 0x94,
+	0x67, 0x80, 0x1a, 0x6d, 0xcc, 0x78, 0xe6, 0xc6, 0x04, 0x4a, 0x33, 0xbe, 0x11, 0x08, 0x38, 0x85,
+	0x47, 0x11, 0xf4, 0x8b, 0xb6, 0x03, 0x4d, 0x09, 0xf0, 0x5b, 0x79, 0x92, 0xb2, 0x1b, 0x4e, 0x59,
+	0x89, 0x4a, 0x65, 0x0c, 0x63, 0x98, 0x59, 0xc6, 0x30, 0x01, 0xc4, 0xf2, 0x64, 0x88, 0x03, 0x4b,
+	0x99, 0x0c, 0xa9, 0x10, 0x57, 0x26, 0x43, 0x3a, 0x2e, 0x9d, 0x89, 0x9f, 0x87, 0x82, 0x61, 0xf1,
+	0x29, 0xa0, 0x34, 0x2c, 0x3e, 0x0d, 0x49, 0xaa, 0x39, 0x64, 0xc7, 0x67, 0xa4, 0x02, 0xc2, 0xa1,
+	0x2f, 0xd2, 0xf2, 0x20, 0x8a, 0x25, 0x95, 0x2f, 0xff, 0x23, 0x5f, 0xa0, 0xed, 0x04, 0x6a, 0x61,
+	0x08, 0x87, 0xb6, 0xa2, 0x47, 0x23, 0x50, 0x48, 0xd9, 0x4e, 0xde, 0x0c, 0x25, 0xcf, 0x3d, 0x28,
+	0xe9, 0x20, 0x07, 0x7d, 0xb5, 0xc8, 0xae, 0xa8, 0xaa, 0xaf, 0x3f, 0x86, 0x75, 0xa6, 0x78, 0x2f,
+	0xcf, 0x2a, 0x54, 0x08, 0xf7, 0xc9, 0x0a, 0x15, 0xc7, 0x9c, 0xb2, 0x42, 0x25, 0x00, 0x45, 0x51,
+	0xeb, 0x24, 0x6e, 0x0a, 0xd5, 0xba, 0x18, 0x2c, 0x0b, 0xd5, 0xba, 0x38, 0xd0, 0x52, 0x73, 0xe8,
+	0x47, 0x3e, 0x81, 0x8e, 0x82, 0x1d, 0x14, 0x1e, 0x04, 0x27, 0xe2, 0x2a, 0x99, 0xf0, 0xa9, 0x48,
+	0x89, 0xbb, 0xfa, 0x0a, 0x56, 0x63, 0xe8, 0x45, 0x4a, 0x4f, 0x03, 0x4a, 0x52, 0x7a, 0x2a, 0xf4,
+	0x51, 0x73, 0xe8, 0xd7, 0x50, 0x12, 0x7f, 0xef, 0xa0, 0xc7, 0x01, 0x7f, 0xe4, 0x5f, 0x23, 0x65,
+	0x23, 0x46, 0x0f, 0x4e, 0xff, 0x00, 0xd5, 0x10, 0xa8, 0x41, 0xe1, 0x82, 0x3b, 0x07, 0x56, 0xa4,
+	0x07, 0x13, 0x50, 0x10, 0xbf, 0xe5, 0x1f, 0x60, 0x7b, 0x11, 0xc2, 0x40, 0x2f, 0x17, 0xbd, 0x93,
+	0x79, 0x6d, 0xaf, 0x3e, 0x8e, 0x39, 0xb8, 0xc8, 0x39, 0x3c, 0x8a, 0x74, 0xcd, 0xb2, 0xbe, 0x25,
+	0x81, 0x19, 0x59, 0xdf, 0x12, 0x5b, 0x6d, 0x7e, 0x1d, 0x0c, 0x8d, 0xa4, 0xce, 0x0c, 0x3d, 0x9f,
+	0x1d, 0x5d, 0xd0, 0x32, 0x2a, 0x2f, 0x16, 0x33, 0x85, 0xd4, 0xfc, 0x08, 0xab, 0xb1, 0x76, 0x55,
+	0xbe, 0x8d, 0xb4, 0x0e, 0x5a, 0xbe, 0x8d, 0xd4, 0x5e, 0x97, 0x49, 0xbf, 0x5e, 0xe1, 0xff, 0x24,
+	0xbf, 0xfe, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0x1c, 0x32, 0x43, 0xf8, 0x7b, 0x1e, 0x00, 0x00,
 }
diff --git a/vendor/vendor.json b/vendor/vendor.json
index a086a2497..38ed23a40 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -201,12 +201,12 @@
 			"revisionTime": "2017-12-31T12:27:32Z"
 		},
 		{
-			"checksumSHA1": "KUINhUSMysgzE3jANykRokazpHc=",
+			"checksumSHA1": "2MLcT+TD1llBP8wYuTzN5yUUlys=",
 			"path": "gitlab.com/gitlab-org/gitaly-proto/go",
-			"revision": "2c731c23abc05437dc89ac24d5f618d0b6160b03",
-			"revisionTime": "2018-04-30T10:24:10Z",
-			"version": "v0.98.0",
-			"versionExact": "v0.98.0"
+			"revision": "7e89ea626eab9efab35f0346d41bb7585e8a11c5",
+			"revisionTime": "2018-05-02T12:27:22Z",
+			"version": "v0.99.0",
+			"versionExact": "v0.99.0"
 		},
 		{
 			"checksumSHA1": "nqWNlnMmVpt628zzvyo6Yv2CX5Q=",