Implement IsRebaseInProgress RPC

Closes #867

10 files changed, 315 insertions, 80 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9736790ab..8054ced84 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 UNRELEASED
 
+- Implement IsRebaseInProgress RPC
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/519
 - Update to gitaly-proto v0.67.0
   https://gitlab.com/gitlab-org/gitaly/merge_requests/520
 - Fix an error in merged all branches logic
diff --git a/internal/service/repository/rebase_in_progress.go b/internal/service/repository/rebase_in_progress.go
new file mode 100644
index 000000000..6b56c78fc
--- /dev/null
+++ b/internal/service/repository/rebase_in_progress.go
@@ -0,0 +1,43 @@
+package repository
+
+import (
+	"fmt"
+
+	pb "gitlab.com/gitlab-org/gitaly-proto/go"
+
+	"gitlab.com/gitlab-org/gitaly/internal/rubyserver"
+
+	"golang.org/x/net/context"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/codes"
+)
+
+func (s *server) IsRebaseInProgress(ctx context.Context, req *pb.IsRebaseInProgressRequest) (*pb.IsRebaseInProgressResponse, error) {
+	if err := validateIsRebaseInProgressRequest(req); err != nil {
+		return nil, grpc.Errorf(codes.InvalidArgument, "IsRebaseInProgress: %v", err)
+	}
+
+	client, err := s.RepositoryServiceClient(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	clientCtx, err := rubyserver.SetHeaders(ctx, req.GetRepository())
+	if err != nil {
+		return nil, err
+	}
+
+	return client.IsRebaseInProgress(clientCtx, req)
+}
+
+func validateIsRebaseInProgressRequest(req *pb.IsRebaseInProgressRequest) error {
+	if req.GetRepository() == nil {
+		return fmt.Errorf("empty Repository")
+	}
+
+	if req.GetRebaseId() == "" {
+		return fmt.Errorf("empty RebaseId")
+	}
+
+	return nil
+}
diff --git a/internal/service/repository/rebase_in_progress_test.go b/internal/service/repository/rebase_in_progress_test.go
new file mode 100644
index 000000000..7037028d1
--- /dev/null
+++ b/internal/service/repository/rebase_in_progress_test.go
@@ -0,0 +1,99 @@
+package repository
+
+import (
+	"path"
+	"testing"
+
+	"gitlab.com/gitlab-org/gitaly/internal/testhelper"
+
+	pb "gitlab.com/gitlab-org/gitaly-proto/go"
+
+	"github.com/stretchr/testify/require"
+	"google.golang.org/grpc/codes"
+)
+
+func TestSuccessfulIsRebaseInProgressRequest(t *testing.T) {
+	server, serverSocketPath := runRepoServer(t)
+	defer server.Stop()
+
+	client, conn := newRepositoryClient(t, serverSocketPath)
+	defer conn.Close()
+
+	testRepo1, testRepo1Path, cleanupFn := testhelper.NewTestRepo(t)
+	defer cleanupFn()
+
+	testhelper.MustRunCommand(t, nil, "git", "-C", testRepo1Path, "worktree", "add", "--detach", path.Join(testRepo1Path, "gitlab-worktree", "rebase-1"), "master")
+
+	testRepo2, _, cleanupFn := testhelper.NewTestRepo(t)
+	defer cleanupFn()
+
+	testCases := []struct {
+		desc       string
+		request    *pb.IsRebaseInProgressRequest
+		inProgress bool
+	}{
+		{
+			desc: "rebase in progress",
+			request: &pb.IsRebaseInProgressRequest{
+				Repository: testRepo1,
+				RebaseId:   "1",
+			},
+			inProgress: true,
+		},
+		{
+			desc: "no rebase in progress",
+			request: &pb.IsRebaseInProgressRequest{
+				Repository: testRepo2,
+				RebaseId:   "2",
+			},
+			inProgress: false,
+		},
+	}
+
+	for _, testCase := range testCases {
+		t.Run(testCase.desc, func(t *testing.T) {
+			ctx, cancel := testhelper.Context()
+			defer cancel()
+
+			response, err := client.IsRebaseInProgress(ctx, testCase.request)
+			require.NoError(t, err)
+
+			require.Equal(t, testCase.inProgress, response.InProgress)
+		})
+	}
+}
+
+func TestFailedIsRebaseInProgressRequestDueToValidations(t *testing.T) {
+	server, serverSocketPath := runRepoServer(t)
+	defer server.Stop()
+
+	client, conn := newRepositoryClient(t, serverSocketPath)
+	defer conn.Close()
+
+	testCases := []struct {
+		desc    string
+		request *pb.IsRebaseInProgressRequest
+		code    codes.Code
+	}{
+		{
+			desc:    "empty repository",
+			request: &pb.IsRebaseInProgressRequest{RebaseId: "1"},
+			code:    codes.InvalidArgument,
+		},
+		{
+			desc:    "empty rebase id",
+			request: &pb.IsRebaseInProgressRequest{Repository: &pb.Repository{}},
+			code:    codes.InvalidArgument,
+		},
+	}
+
+	for _, testCase := range testCases {
+		t.Run(testCase.desc, func(t *testing.T) {
+			ctx, cancel := testhelper.Context()
+			defer cancel()
+
+			_, err := client.IsRebaseInProgress(ctx, testCase.request)
+			testhelper.AssertGrpcError(t, err, testCase.code, "")
+		})
+	}
+}
diff --git a/ruby/Gemfile b/ruby/Gemfile
index cf2e35de4..dc8d9fb68 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.66.0', require: 'gitaly'
+gem 'gitaly-proto', '~> 0.68.0', require: 'gitaly'
 gem 'activesupport'
 gem 'rdoc', '~> 4.2'
 gem 'gollum-lib', '~> 4.2', require: false
diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock
index 13742d903..85b9d3140 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.66.0)
+    gitaly-proto (0.68.0)
       google-protobuf (~> 3.1)
       grpc (~> 1.0)
     github-linguist (4.7.6)
@@ -133,7 +133,7 @@ PLATFORMS
 
 DEPENDENCIES
   activesupport
-  gitaly-proto (~> 0.66.0)
+  gitaly-proto (~> 0.68.0)
   github-linguist (~> 4.7.0)
   gitlab-styles (~> 2.0.0)
   gollum-lib (~> 4.2)
diff --git a/ruby/lib/gitaly_server/repository_service.rb b/ruby/lib/gitaly_server/repository_service.rb
index 244f101b6..bcdcbd763 100644
--- a/ruby/lib/gitaly_server/repository_service.rb
+++ b/ruby/lib/gitaly_server/repository_service.rb
@@ -70,5 +70,15 @@ module GitalyServer
         Gitaly::FetchRemoteResponse.new
       end
     end
+
+    def is_rebase_in_progress(request, call) # rubocop:disable Naming/PredicateName
+      bridge_exceptions do
+        repo = Gitlab::Git::Repository.from_gitaly(request.repository, call)
+
+        result = repo.rebase_in_progress?(request.rebase_id)
+
+        Gitaly::IsRebaseInProgressResponse.new(in_progress: result)
+      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 328185caa..4a46fb5b7 100644
--- a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION
+++ b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION
@@ -1 +1 @@
-0.67.0
+0.68.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 4ba261023..0868ce868 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
@@ -179,6 +179,8 @@ It has these top-level messages:
 	FindMergeBaseResponse
 	CreateForkRequest
 	CreateForkResponse
+	IsRebaseInProgressRequest
+	IsRebaseInProgressResponse
 	Repository
 	GitCommit
 	CommitAuthor
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 da805e2c3..a2494bac6 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
@@ -666,6 +666,46 @@ func (m *CreateForkResponse) String() string            { return proto.CompactTe
 func (*CreateForkResponse) ProtoMessage()               {}
 func (*CreateForkResponse) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{31} }
 
+type IsRebaseInProgressRequest struct {
+	Repository *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"`
+	RebaseId   string      `protobuf:"bytes,2,opt,name=rebase_id,json=rebaseId" json:"rebase_id,omitempty"`
+}
+
+func (m *IsRebaseInProgressRequest) Reset()                    { *m = IsRebaseInProgressRequest{} }
+func (m *IsRebaseInProgressRequest) String() string            { return proto.CompactTextString(m) }
+func (*IsRebaseInProgressRequest) ProtoMessage()               {}
+func (*IsRebaseInProgressRequest) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{32} }
+
+func (m *IsRebaseInProgressRequest) GetRepository() *Repository {
+	if m != nil {
+		return m.Repository
+	}
+	return nil
+}
+
+func (m *IsRebaseInProgressRequest) GetRebaseId() string {
+	if m != nil {
+		return m.RebaseId
+	}
+	return ""
+}
+
+type IsRebaseInProgressResponse struct {
+	InProgress bool `protobuf:"varint,1,opt,name=in_progress,json=inProgress" json:"in_progress,omitempty"`
+}
+
+func (m *IsRebaseInProgressResponse) Reset()                    { *m = IsRebaseInProgressResponse{} }
+func (m *IsRebaseInProgressResponse) String() string            { return proto.CompactTextString(m) }
+func (*IsRebaseInProgressResponse) ProtoMessage()               {}
+func (*IsRebaseInProgressResponse) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{33} }
+
+func (m *IsRebaseInProgressResponse) GetInProgress() bool {
+	if m != nil {
+		return m.InProgress
+	}
+	return false
+}
+
 func init() {
 	proto.RegisterType((*RepositoryExistsRequest)(nil), "gitaly.RepositoryExistsRequest")
 	proto.RegisterType((*RepositoryExistsResponse)(nil), "gitaly.RepositoryExistsResponse")
@@ -699,6 +739,8 @@ func init() {
 	proto.RegisterType((*FindMergeBaseResponse)(nil), "gitaly.FindMergeBaseResponse")
 	proto.RegisterType((*CreateForkRequest)(nil), "gitaly.CreateForkRequest")
 	proto.RegisterType((*CreateForkResponse)(nil), "gitaly.CreateForkResponse")
+	proto.RegisterType((*IsRebaseInProgressRequest)(nil), "gitaly.IsRebaseInProgressRequest")
+	proto.RegisterType((*IsRebaseInProgressResponse)(nil), "gitaly.IsRebaseInProgressResponse")
 	proto.RegisterEnum("gitaly.GetArchiveRequest_Format", GetArchiveRequest_Format_name, GetArchiveRequest_Format_value)
 }
 
@@ -729,6 +771,7 @@ type RepositoryServiceClient interface {
 	WriteRef(ctx context.Context, in *WriteRefRequest, opts ...grpc.CallOption) (*WriteRefResponse, error)
 	FindMergeBase(ctx context.Context, in *FindMergeBaseRequest, opts ...grpc.CallOption) (*FindMergeBaseResponse, error)
 	CreateFork(ctx context.Context, in *CreateForkRequest, opts ...grpc.CallOption) (*CreateForkResponse, error)
+	IsRebaseInProgress(ctx context.Context, in *IsRebaseInProgressRequest, opts ...grpc.CallOption) (*IsRebaseInProgressResponse, error)
 }
 
 type repositoryServiceClient struct {
@@ -906,6 +949,15 @@ func (c *repositoryServiceClient) CreateFork(ctx context.Context, in *CreateFork
 	return out, nil
 }
 
+func (c *repositoryServiceClient) IsRebaseInProgress(ctx context.Context, in *IsRebaseInProgressRequest, opts ...grpc.CallOption) (*IsRebaseInProgressResponse, error) {
+	out := new(IsRebaseInProgressResponse)
+	err := grpc.Invoke(ctx, "/gitaly.RepositoryService/IsRebaseInProgress", in, out, c.cc, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 // Server API for RepositoryService service
 
 type RepositoryServiceServer interface {
@@ -925,6 +977,7 @@ type RepositoryServiceServer interface {
 	WriteRef(context.Context, *WriteRefRequest) (*WriteRefResponse, error)
 	FindMergeBase(context.Context, *FindMergeBaseRequest) (*FindMergeBaseResponse, error)
 	CreateFork(context.Context, *CreateForkRequest) (*CreateForkResponse, error)
+	IsRebaseInProgress(context.Context, *IsRebaseInProgressRequest) (*IsRebaseInProgressResponse, error)
 }
 
 func RegisterRepositoryServiceServer(s *grpc.Server, srv RepositoryServiceServer) {
@@ -1222,6 +1275,24 @@ func _RepositoryService_CreateFork_Handler(srv interface{}, ctx context.Context,
 	return interceptor(ctx, in, info, handler)
 }
 
+func _RepositoryService_IsRebaseInProgress_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(IsRebaseInProgressRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(RepositoryServiceServer).IsRebaseInProgress(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/gitaly.RepositoryService/IsRebaseInProgress",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(RepositoryServiceServer).IsRebaseInProgress(ctx, req.(*IsRebaseInProgressRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 var _RepositoryService_serviceDesc = grpc.ServiceDesc{
 	ServiceName: "gitaly.RepositoryService",
 	HandlerType: (*RepositoryServiceServer)(nil),
@@ -1286,6 +1357,10 @@ var _RepositoryService_serviceDesc = grpc.ServiceDesc{
 			MethodName: "CreateFork",
 			Handler:    _RepositoryService_CreateFork_Handler,
 		},
+		{
+			MethodName: "IsRebaseInProgress",
+			Handler:    _RepositoryService_IsRebaseInProgress_Handler,
+		},
 	},
 	Streams: []grpc.StreamDesc{
 		{
@@ -1300,75 +1375,79 @@ var _RepositoryService_serviceDesc = grpc.ServiceDesc{
 func init() { proto.RegisterFile("repository-service.proto", fileDescriptor10) }
 
 var fileDescriptor10 = []byte{
-	// 1116 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x57, 0xdd, 0x6e, 0xe3, 0x36,
-	0x13, 0xb5, 0xe3, 0xc4, 0x8e, 0x27, 0xde, 0xfd, 0x1c, 0x6e, 0x7e, 0x14, 0x25, 0xf9, 0x36, 0x65,
-	0x7b, 0x11, 0xa0, 0x6d, 0xb0, 0x70, 0x80, 0xa2, 0x77, 0x8b, 0x64, 0x11, 0x27, 0xc1, 0x36, 0x8b,
-	0x56, 0x1b, 0x20, 0x40, 0x80, 0xc2, 0xa0, 0x65, 0xda, 0x16, 0xfc, 0x43, 0x97, 0xa4, 0xd3, 0xf5,
-	0x3e, 0x41, 0xfb, 0x12, 0x7d, 0xa9, 0x3e, 0x42, 0x2f, 0xfb, 0x12, 0x85, 0x48, 0x5a, 0x94, 0x2c,
-	0x29, 0x37, 0x42, 0xd1, 0x3b, 0x71, 0x48, 0x9e, 0x39, 0x9c, 0x21, 0x67, 0x8e, 0xc0, 0xe1, 0x74,
-	0xc6, 0x44, 0x20, 0x19, 0x5f, 0x7c, 0x2b, 0x28, 0x7f, 0x0a, 0x7c, 0x7a, 0x36, 0xe3, 0x4c, 0x32,
-	0x54, 0x1d, 0x04, 0x92, 0x8c, 0x17, 0x6e, 0x43, 0x0c, 0x09, 0xa7, 0x3d, 0x6d, 0xc5, 0x77, 0xb0,
-	0xef, 0x45, 0x3b, 0xae, 0x3e, 0x05, 0x42, 0x0a, 0x8f, 0xfe, 0x32, 0xa7, 0x42, 0xa2, 0x16, 0x80,
-	0x05, 0x73, 0xca, 0x27, 0xe5, 0xd3, 0xad, 0x16, 0x3a, 0xd3, 0x28, 0x67, 0x76, 0x93, 0x17, 0x5b,
-	0x85, 0x5b, 0xe0, 0xa4, 0xe1, 0xc4, 0x8c, 0x4d, 0x05, 0x45, 0x7b, 0x50, 0xa5, 0xca, 0xa2, 0xb0,
-	0x36, 0x3d, 0x33, 0xc2, 0x1f, 0xe2, 0x7b, 0x6e, 0xc5, 0xd5, 0x64, 0x26, 0x17, 0x45, 0x38, 0x7c,
-	0x07, 0x07, 0x19, 0x78, 0x86, 0xc4, 0x01, 0x6c, 0x06, 0xa2, 0x43, 0x43, 0x9b, 0xa1, 0x51, 0x0b,
-	0xf4, 0x12, 0xc3, 0x83, 0xf8, 0xa3, 0xdb, 0xa9, 0xcf, 0xe9, 0x84, 0x4e, 0x25, 0x19, 0x17, 0xe1,
-	0x71, 0xa8, 0x78, 0xac, 0xe2, 0x69, 0x1e, 0x78, 0x0c, 0xdb, 0x7a, 0xb2, 0x3d, 0x1f, 0x17, 0xf1,
-	0x82, 0xbe, 0x84, 0x17, 0x3e, 0xa7, 0x44, 0xd2, 0x4e, 0x37, 0x90, 0x13, 0x32, 0x73, 0xd6, 0xd4,
-	0xa9, 0x1a, 0xda, 0x78, 0xa9, 0x6c, 0x78, 0x07, 0x50, 0xdc, 0x9b, 0xe1, 0x30, 0x83, 0xdd, 0x6b,
-	0xc2, 0xbb, 0x64, 0x40, 0xdf, 0xb1, 0xf1, 0x98, 0xfa, 0xf2, 0x5f, 0xe7, 0xe1, 0xc0, 0xde, 0xaa,
-	0x47, 0xc3, 0xe5, 0x3d, 0xec, 0x5a, 0xe0, 0x8f, 0xc1, 0x67, 0x5a, 0x24, 0xf2, 0xdf, 0xc0, 0xde,
-	0x2a, 0x98, 0x49, 0x3f, 0x82, 0x75, 0x11, 0x7c, 0xa6, 0x0a, 0xa7, 0xe2, 0xa9, 0x6f, 0x3c, 0x82,
-	0x83, 0x8b, 0xd9, 0x6c, 0xbc, 0xb8, 0x0e, 0x24, 0x91, 0x92, 0x07, 0xdd, 0xb9, 0xa4, 0x45, 0x1e,
-	0x01, 0x72, 0x61, 0x93, 0xd3, 0xa7, 0x40, 0x04, 0x6c, 0xaa, 0xa2, 0xd0, 0xf0, 0xa2, 0x31, 0x3e,
-	0x02, 0x37, 0xcb, 0x99, 0x89, 0xc2, 0x5f, 0x65, 0x40, 0x6d, 0x2a, 0xfd, 0xa1, 0x47, 0x27, 0x4c,
-	0x16, 0x89, 0x41, 0xf8, 0xda, 0xb8, 0x02, 0x51, 0x14, 0xea, 0x9e, 0x19, 0xa1, 0x1d, 0xd8, 0xe8,
-	0x33, 0xee, 0x53, 0xa7, 0xa2, 0xf2, 0xa3, 0x07, 0x68, 0x1f, 0x6a, 0x53, 0xd6, 0x91, 0x64, 0x20,
-	0x9c, 0x75, 0xfd, 0x38, 0xa7, 0xec, 0x9e, 0x0c, 0x04, 0x72, 0xa0, 0x26, 0x83, 0x09, 0x65, 0x73,
-	0xe9, 0x6c, 0x9c, 0x94, 0x4f, 0x37, 0xbc, 0xe5, 0x30, 0xdc, 0x22, 0xc4, 0xb0, 0x33, 0xa2, 0x0b,
-	0xa7, 0xaa, 0x3d, 0x08, 0x31, 0x7c, 0x4f, 0x17, 0xe8, 0x35, 0x6c, 0x8d, 0xa6, 0xec, 0xd7, 0x69,
-	0x67, 0xc8, 0xc2, 0xc7, 0x5e, 0x53, 0x93, 0xa0, 0x4c, 0x37, 0xa1, 0x05, 0xef, 0xc2, 0xab, 0xc4,
-	0x21, 0xcd, 0xe1, 0xef, 0x60, 0xff, 0x9d, 0xba, 0x2c, 0xb1, 0x13, 0x15, 0xb8, 0x04, 0x2e, 0x38,
-	0x69, 0x38, 0xe3, 0xea, 0xef, 0x32, 0x6c, 0x5f, 0x53, 0x79, 0xc1, 0xfd, 0x61, 0xf0, 0x54, 0x28,
-	0xcc, 0x87, 0x50, 0xf7, 0xd9, 0x64, 0x12, 0xc8, 0x4e, 0xd0, 0x33, 0x91, 0xde, 0xd4, 0x86, 0xdb,
-	0x5e, 0x98, 0x83, 0x19, 0xa7, 0xfd, 0xe0, 0x93, 0x0a, 0x76, 0xdd, 0x33, 0x23, 0xf4, 0x3d, 0x54,
-	0xfb, 0x8c, 0x4f, 0x88, 0x54, 0xc1, 0x7e, 0xd9, 0x3a, 0x59, 0x3a, 0x49, 0x71, 0x3a, 0x6b, 0xab,
-	0x75, 0x9e, 0x59, 0x8f, 0xcf, 0xa1, 0xaa, 0x2d, 0xa8, 0x06, 0x95, 0xc7, 0xdb, 0x1f, 0x9b, 0xa5,
-	0xf0, 0xe3, 0xfe, 0xc2, 0x6b, 0x96, 0x11, 0x40, 0xf5, 0xfe, 0xc2, 0xeb, 0x5c, 0x3f, 0x36, 0xd7,
-	0xd0, 0x16, 0xd4, 0xc2, 0xef, 0xcb, 0xc7, 0x56, 0xb3, 0x82, 0x4f, 0x01, 0xc5, 0x81, 0xed, 0x53,
-	0xe8, 0x11, 0x49, 0xd4, 0x39, 0x1b, 0x9e, 0xfa, 0x0e, 0x53, 0x70, 0x43, 0xc4, 0x0f, 0xcc, 0x27,
-	0xe3, 0x4b, 0x4e, 0xa6, 0xfe, 0xb0, 0xd0, 0x43, 0xc0, 0x6f, 0xc0, 0x49, 0xc3, 0x19, 0xf7, 0x3b,
-	0xb0, 0xf1, 0x44, 0xc6, 0x73, 0x6a, 0xaa, 0xb0, 0x1e, 0xe0, 0x3f, 0xcb, 0xe0, 0xa8, 0xbb, 0xf1,
-	0x91, 0xcd, 0xb9, 0x4f, 0xf5, 0xae, 0x22, 0xf9, 0x79, 0x0b, 0xdb, 0x42, 0x41, 0x75, 0x62, 0x5b,
-	0xd7, 0x72, 0xb7, 0x36, 0xf5, 0x62, 0x2f, 0x51, 0xd7, 0x0c, 0x40, 0x57, 0x91, 0x51, 0xa9, 0x6c,
-	0x78, 0x0d, 0x11, 0x23, 0x88, 0x8e, 0x01, 0x24, 0xe1, 0x03, 0x2a, 0x3b, 0x9c, 0xf6, 0x55, 0x52,
-	0x1b, 0x5e, 0x5d, 0x5b, 0x3c, 0xda, 0xc7, 0xe7, 0x70, 0x90, 0x71, 0x28, 0xdb, 0x16, 0x39, 0x15,
-	0xf3, 0xb1, 0x5c, 0xb6, 0x45, 0x3d, 0xc2, 0x17, 0xb0, 0xd5, 0x16, 0xfe, 0xa8, 0x48, 0xfc, 0xbf,
-	0x82, 0x86, 0x86, 0xb0, 0x31, 0xa7, 0x9c, 0x33, 0x6e, 0x72, 0xae, 0x07, 0xf8, 0xf7, 0x32, 0xfc,
-	0xef, 0x81, 0x07, 0xe1, 0x43, 0xe9, 0x17, 0x09, 0x75, 0x13, 0x2a, 0xe1, 0xe9, 0x75, 0xc5, 0x0b,
-	0x3f, 0x13, 0x85, 0xb0, 0x92, 0x2c, 0x84, 0xb6, 0x0e, 0xad, 0xc7, 0xea, 0x10, 0x3e, 0x85, 0xa6,
-	0xa5, 0xf2, 0x2c, 0xeb, 0x21, 0xec, 0xb4, 0x83, 0x69, 0xef, 0x8e, 0xf2, 0x01, 0xbd, 0x24, 0xa2,
-	0xd0, 0x23, 0x3e, 0x82, 0xfa, 0x92, 0x97, 0x70, 0xd6, 0x4e, 0x2a, 0x61, 0xf6, 0x22, 0x03, 0xfe,
-	0x1a, 0x76, 0x57, 0x3c, 0xd9, 0x17, 0xd4, 0x25, 0x42, 0xdf, 0xe0, 0xba, 0xa7, 0xbe, 0xf1, 0x6f,
-	0x65, 0xd8, 0xd6, 0x65, 0xa7, 0xcd, 0xf8, 0xe8, 0xbf, 0xbc, 0xb9, 0x61, 0xd3, 0x8f, 0x33, 0xd1,
-	0xa4, 0x5b, 0x7f, 0x80, 0x52, 0x1e, 0xcb, 0xe6, 0xa8, 0x25, 0x22, 0x7a, 0x80, 0xe6, 0xaa, 0x6e,
-	0x43, 0xaf, 0xd3, 0x5e, 0x12, 0x02, 0xd1, 0x3d, 0xc9, 0x5f, 0x60, 0xea, 0x6c, 0x09, 0x3d, 0xc6,
-	0xbd, 0x19, 0x31, 0x86, 0x32, 0x36, 0x26, 0x75, 0x9f, 0xfb, 0xc5, 0x33, 0x2b, 0x56, 0xb0, 0x93,
-	0x02, 0x2b, 0x81, 0x9d, 0xa9, 0xe5, 0x12, 0xd8, 0x39, 0xea, 0xac, 0x84, 0xae, 0x00, 0xac, 0x62,
-	0x42, 0x07, 0xc9, 0x2d, 0x31, 0xcd, 0xe6, 0xba, 0x59, 0x53, 0x11, 0xcc, 0x4f, 0xf0, 0x32, 0x29,
-	0x78, 0xd0, 0x71, 0x54, 0xeb, 0xb3, 0xa4, 0x97, 0xfb, 0xff, 0xbc, 0xe9, 0x38, 0x64, 0x52, 0xdc,
-	0x58, 0xc8, 0x4c, 0x05, 0x65, 0x21, 0xb3, 0x35, 0x11, 0x2e, 0xa1, 0x9f, 0x01, 0xa5, 0x45, 0x09,
-	0x8a, 0xe2, 0x94, 0xab, 0x8e, 0x5c, 0xfc, 0xdc, 0x92, 0x08, 0xfe, 0x06, 0xb6, 0x62, 0xfd, 0x1e,
-	0x45, 0x11, 0x4b, 0x2b, 0x1d, 0xf7, 0x30, 0x73, 0x2e, 0x42, 0x7a, 0x80, 0xe6, 0x6a, 0x4f, 0xb7,
-	0xd7, 0x34, 0x47, 0x3c, 0xd8, 0x6b, 0x9a, 0x2b, 0x07, 0x4a, 0xe8, 0x1a, 0xc0, 0xb6, 0x48, 0x9b,
-	0xee, 0x54, 0x3f, 0xb6, 0xe9, 0x4e, 0x77, 0x54, 0x5c, 0x7a, 0x53, 0x0e, 0x19, 0xae, 0xb6, 0x3c,
-	0xcb, 0x30, 0xa7, 0xb7, 0x5a, 0x86, 0x79, 0xdd, 0x52, 0x5f, 0xf6, 0x54, 0x0f, 0xb1, 0x97, 0x3d,
-	0xaf, 0x67, 0xda, 0xcb, 0x9e, 0xdb, 0x80, 0x70, 0x09, 0x9d, 0xc3, 0x7a, 0xd8, 0x27, 0xd0, 0xab,
-	0x68, 0xb1, 0x6d, 0x3c, 0xee, 0x4e, 0xd2, 0x18, 0x6d, 0x7a, 0x0b, 0x9b, 0xcb, 0x52, 0x8d, 0xf6,
-	0x97, 0x6b, 0x56, 0xfa, 0x88, 0xeb, 0xa4, 0x27, 0x22, 0x80, 0x0f, 0xf0, 0x22, 0x51, 0x57, 0xd1,
-	0x51, 0xe4, 0x29, 0xa3, 0xb0, 0xbb, 0xc7, 0x39, 0xb3, 0xf1, 0x27, 0x6b, 0xeb, 0x9d, 0xcd, 0x61,
-	0xaa, 0x1a, 0xdb, 0x1c, 0xa6, 0xcb, 0x23, 0x2e, 0x75, 0xab, 0xea, 0xc7, 0xf8, 0xfc, 0x9f, 0x00,
-	0x00, 0x00, 0xff, 0xff, 0x14, 0xbc, 0x13, 0x49, 0x4a, 0x0f, 0x00, 0x00,
+	// 1175 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0xd1, 0x6e, 0xdb, 0x36,
+	0x17, 0xb6, 0xe3, 0xc4, 0x8e, 0x8f, 0xdd, 0xfe, 0x0e, 0x9b, 0x34, 0xb2, 0xda, 0xfe, 0xc9, 0xb8,
+	0x5d, 0x04, 0xd8, 0x16, 0x14, 0x0e, 0x30, 0xec, 0x66, 0x28, 0x92, 0x22, 0x4e, 0x8c, 0x2e, 0x45,
+	0xa7, 0x06, 0x08, 0x10, 0x60, 0x30, 0x64, 0x99, 0xb6, 0x09, 0xdb, 0x92, 0x47, 0xd2, 0x59, 0xdd,
+	0x27, 0xd8, 0x9e, 0x6f, 0x8f, 0xb0, 0xcb, 0x3d, 0xc3, 0x80, 0x41, 0x24, 0x2d, 0x4a, 0x96, 0x94,
+	0x1b, 0x61, 0xd8, 0x9d, 0x78, 0x48, 0x7e, 0xfc, 0x78, 0x0e, 0xcf, 0x39, 0x1f, 0x04, 0x16, 0x23,
+	0x8b, 0x80, 0x53, 0x11, 0xb0, 0xd5, 0xb7, 0x9c, 0xb0, 0x07, 0xea, 0x91, 0xd3, 0x05, 0x0b, 0x44,
+	0x80, 0xaa, 0x63, 0x2a, 0xdc, 0xd9, 0xca, 0x6e, 0xf2, 0x89, 0xcb, 0xc8, 0x50, 0x59, 0xf1, 0x0d,
+	0x1c, 0x3a, 0xd1, 0x8e, 0xcb, 0x4f, 0x94, 0x0b, 0xee, 0x90, 0x5f, 0x96, 0x84, 0x0b, 0xd4, 0x01,
+	0x30, 0x60, 0x56, 0xf9, 0xb8, 0x7c, 0xd2, 0xe8, 0xa0, 0x53, 0x85, 0x72, 0x6a, 0x36, 0x39, 0xb1,
+	0x55, 0xb8, 0x03, 0x56, 0x1a, 0x8e, 0x2f, 0x02, 0x9f, 0x13, 0xf4, 0x1c, 0xaa, 0x44, 0x5a, 0x24,
+	0xd6, 0xae, 0xa3, 0x47, 0xf8, 0x7d, 0x7c, 0x4f, 0x8f, 0x5f, 0xce, 0x17, 0x62, 0x55, 0x84, 0xc3,
+	0x77, 0xd0, 0xce, 0xc0, 0xd3, 0x24, 0xda, 0xb0, 0x4b, 0x79, 0x9f, 0x84, 0x36, 0x4d, 0xa3, 0x46,
+	0xd5, 0x12, 0xcd, 0xc3, 0xf5, 0xa6, 0x3d, 0xdf, 0x63, 0x64, 0x4e, 0x7c, 0xe1, 0xce, 0x8a, 0xf0,
+	0x78, 0x21, 0x79, 0x6c, 0xe2, 0x29, 0x1e, 0x78, 0x06, 0x7b, 0x6a, 0xb2, 0xbb, 0x9c, 0x15, 0x39,
+	0x05, 0x7d, 0x09, 0x4f, 0x3c, 0x46, 0x5c, 0x41, 0xfa, 0x03, 0x2a, 0xe6, 0xee, 0xc2, 0xda, 0x92,
+	0xb7, 0x6a, 0x2a, 0xe3, 0x85, 0xb4, 0xe1, 0x7d, 0x40, 0xf1, 0xd3, 0x34, 0x87, 0x05, 0x1c, 0x5c,
+	0xb9, 0x6c, 0xe0, 0x8e, 0xc9, 0xdb, 0x60, 0x36, 0x23, 0x9e, 0xf8, 0xd7, 0x79, 0x58, 0xf0, 0x7c,
+	0xf3, 0x44, 0xcd, 0xe5, 0x1d, 0x1c, 0x18, 0xe0, 0x8f, 0xf4, 0x33, 0x29, 0xe2, 0xf9, 0x6f, 0xe0,
+	0xf9, 0x26, 0x98, 0x0e, 0x3f, 0x82, 0x6d, 0x4e, 0x3f, 0x13, 0x89, 0x53, 0x71, 0xe4, 0x37, 0x9e,
+	0x42, 0xfb, 0x7c, 0xb1, 0x98, 0xad, 0xae, 0xa8, 0x70, 0x85, 0x60, 0x74, 0xb0, 0x14, 0xa4, 0x48,
+	0x12, 0x20, 0x1b, 0x76, 0x19, 0x79, 0xa0, 0x9c, 0x06, 0xbe, 0xf4, 0x42, 0xd3, 0x89, 0xc6, 0xf8,
+	0x25, 0xd8, 0x59, 0x87, 0x69, 0x2f, 0xfc, 0x59, 0x06, 0xd4, 0x25, 0xc2, 0x9b, 0x38, 0x64, 0x1e,
+	0x88, 0x22, 0x3e, 0x08, 0xb3, 0x8d, 0x49, 0x10, 0x49, 0xa1, 0xee, 0xe8, 0x11, 0xda, 0x87, 0x9d,
+	0x51, 0xc0, 0x3c, 0x62, 0x55, 0x64, 0x7c, 0xd4, 0x00, 0x1d, 0x42, 0xcd, 0x0f, 0xfa, 0xc2, 0x1d,
+	0x73, 0x6b, 0x5b, 0x25, 0xa7, 0x1f, 0xdc, 0xba, 0x63, 0x8e, 0x2c, 0xa8, 0x09, 0x3a, 0x27, 0xc1,
+	0x52, 0x58, 0x3b, 0xc7, 0xe5, 0x93, 0x1d, 0x67, 0x3d, 0x0c, 0xb7, 0x70, 0x3e, 0xe9, 0x4f, 0xc9,
+	0xca, 0xaa, 0xaa, 0x13, 0x38, 0x9f, 0xbc, 0x23, 0x2b, 0x74, 0x04, 0x8d, 0xa9, 0x1f, 0xfc, 0xea,
+	0xf7, 0x27, 0x41, 0x98, 0xec, 0x35, 0x39, 0x09, 0xd2, 0x74, 0x1d, 0x5a, 0xf0, 0x01, 0x3c, 0x4b,
+	0x5c, 0x52, 0x5f, 0xfe, 0x06, 0x0e, 0xdf, 0xca, 0xc7, 0x12, 0xbb, 0x51, 0x81, 0x47, 0x60, 0x83,
+	0x95, 0x86, 0xd3, 0x47, 0xfd, 0x55, 0x86, 0xbd, 0x2b, 0x22, 0xce, 0x99, 0x37, 0xa1, 0x0f, 0x85,
+	0xdc, 0xfc, 0x02, 0xea, 0x5e, 0x30, 0x9f, 0x53, 0xd1, 0xa7, 0x43, 0xed, 0xe9, 0x5d, 0x65, 0xe8,
+	0x0d, 0xc3, 0x18, 0x2c, 0x18, 0x19, 0xd1, 0x4f, 0xd2, 0xd9, 0x75, 0x47, 0x8f, 0xd0, 0xf7, 0x50,
+	0x1d, 0x05, 0x6c, 0xee, 0x0a, 0xe9, 0xec, 0xa7, 0x9d, 0xe3, 0xf5, 0x21, 0x29, 0x4e, 0xa7, 0x5d,
+	0xb9, 0xce, 0xd1, 0xeb, 0xf1, 0x19, 0x54, 0x95, 0x05, 0xd5, 0xa0, 0x72, 0xdf, 0xfb, 0xd0, 0x2a,
+	0x85, 0x1f, 0xb7, 0xe7, 0x4e, 0xab, 0x8c, 0x00, 0xaa, 0xb7, 0xe7, 0x4e, 0xff, 0xea, 0xbe, 0xb5,
+	0x85, 0x1a, 0x50, 0x0b, 0xbf, 0x2f, 0xee, 0x3b, 0xad, 0x0a, 0x3e, 0x01, 0x14, 0x07, 0x36, 0xa9,
+	0x30, 0x74, 0x85, 0x2b, 0xef, 0xd9, 0x74, 0xe4, 0x77, 0x18, 0x82, 0x6b, 0x97, 0xff, 0x18, 0x78,
+	0xee, 0xec, 0x82, 0xb9, 0xbe, 0x37, 0x29, 0x94, 0x08, 0xf8, 0x35, 0x58, 0x69, 0x38, 0x7d, 0xfc,
+	0x3e, 0xec, 0x3c, 0xb8, 0xb3, 0x25, 0xd1, 0x55, 0x58, 0x0d, 0xf0, 0x1f, 0x65, 0xb0, 0xe4, 0xdb,
+	0xf8, 0x18, 0x2c, 0x99, 0x47, 0xd4, 0xae, 0x22, 0xf1, 0x79, 0x03, 0x7b, 0x5c, 0x42, 0xf5, 0x63,
+	0x5b, 0xb7, 0x72, 0xb7, 0xb6, 0xd4, 0x62, 0x27, 0x51, 0xd7, 0x34, 0xc0, 0x40, 0x92, 0x91, 0xa1,
+	0x6c, 0x3a, 0x4d, 0x1e, 0x23, 0x88, 0x5e, 0x01, 0x08, 0x97, 0x8d, 0x89, 0xe8, 0x33, 0x32, 0x92,
+	0x41, 0x6d, 0x3a, 0x75, 0x65, 0x71, 0xc8, 0x08, 0x9f, 0x41, 0x3b, 0xe3, 0x52, 0xa6, 0x2d, 0x32,
+	0xc2, 0x97, 0x33, 0xb1, 0x6e, 0x8b, 0x6a, 0x84, 0xcf, 0xa1, 0xd1, 0xe5, 0xde, 0xb4, 0x88, 0xff,
+	0xbf, 0x82, 0xa6, 0x82, 0x30, 0x3e, 0x27, 0x8c, 0x05, 0x4c, 0xc7, 0x5c, 0x0d, 0xf0, 0xef, 0x65,
+	0xf8, 0xdf, 0x1d, 0xa3, 0x61, 0xa2, 0x8c, 0x8a, 0xb8, 0xba, 0x05, 0x95, 0xf0, 0xf6, 0xaa, 0xe2,
+	0x85, 0x9f, 0x89, 0x42, 0x58, 0x49, 0x16, 0x42, 0x53, 0x87, 0xb6, 0x63, 0x75, 0x08, 0x9f, 0x40,
+	0xcb, 0x50, 0x79, 0x94, 0xf5, 0x04, 0xf6, 0xbb, 0xd4, 0x1f, 0xde, 0x10, 0x36, 0x26, 0x17, 0x2e,
+	0x2f, 0x94, 0xc4, 0x2f, 0xa1, 0xbe, 0xe6, 0xc5, 0xad, 0xad, 0xe3, 0x4a, 0x18, 0xbd, 0xc8, 0x80,
+	0xbf, 0x86, 0x83, 0x8d, 0x93, 0x4c, 0x06, 0x0d, 0x5c, 0xae, 0x5e, 0x70, 0xdd, 0x91, 0xdf, 0xf8,
+	0xb7, 0x32, 0xec, 0xa9, 0xb2, 0xd3, 0x0d, 0xd8, 0xf4, 0xbf, 0x7c, 0xb9, 0x61, 0xd3, 0x8f, 0x33,
+	0x89, 0x84, 0x47, 0xbb, 0xc7, 0x1d, 0x12, 0x92, 0xed, 0xf9, 0x1f, 0x58, 0x30, 0x66, 0x84, 0xf3,
+	0x82, 0x15, 0x90, 0x49, 0xb8, 0x58, 0x05, 0x54, 0x86, 0xde, 0x10, 0xff, 0x00, 0x76, 0xd6, 0x69,
+	0xda, 0x81, 0x47, 0xd0, 0xa0, 0x7e, 0x7f, 0xa1, 0xcd, 0xfa, 0xfd, 0x03, 0x8d, 0x16, 0x76, 0xfe,
+	0x06, 0x29, 0x93, 0xd6, 0x9d, 0x5c, 0xe9, 0x59, 0x74, 0x07, 0xad, 0x4d, 0x91, 0x89, 0x8e, 0xd2,
+	0x2c, 0x13, 0x6a, 0xd6, 0x3e, 0xce, 0x5f, 0xa0, 0x3d, 0x53, 0x42, 0xf7, 0xf1, 0xd3, 0xb4, 0x72,
+	0x44, 0x19, 0x1b, 0x93, 0x22, 0xd5, 0xfe, 0xe2, 0x91, 0x15, 0x1b, 0xd8, 0x49, 0x35, 0x98, 0xc0,
+	0xce, 0x14, 0x9e, 0x09, 0xec, 0x1c, 0x29, 0x59, 0x42, 0x97, 0x00, 0x46, 0xde, 0xa1, 0x76, 0x72,
+	0x4b, 0x4c, 0x60, 0xda, 0x76, 0xd6, 0x54, 0x04, 0xf3, 0x13, 0x3c, 0x4d, 0xaa, 0x33, 0xf4, 0x2a,
+	0x6a, 0x4c, 0x59, 0x3a, 0xd1, 0xfe, 0x7f, 0xde, 0x74, 0x1c, 0x32, 0xa9, 0xc4, 0x0c, 0x64, 0xa6,
+	0xdc, 0x33, 0x90, 0xd9, 0x02, 0x0e, 0x97, 0xd0, 0xcf, 0x80, 0xd2, 0x0a, 0x0a, 0x45, 0x7e, 0xca,
+	0x95, 0x72, 0x36, 0x7e, 0x6c, 0x49, 0x04, 0x7f, 0x0d, 0x8d, 0x98, 0x38, 0x41, 0x91, 0xc7, 0xd2,
+	0xb2, 0xcc, 0x7e, 0x91, 0x39, 0x17, 0x21, 0xdd, 0x41, 0x6b, 0x53, 0x80, 0x98, 0x67, 0x9a, 0xa3,
+	0x74, 0xcc, 0x33, 0xcd, 0xd5, 0x2e, 0x25, 0x74, 0x05, 0x60, 0xfa, 0xb9, 0x09, 0x77, 0x4a, 0x3c,
+	0x98, 0x70, 0xa7, 0xdb, 0x3f, 0x2e, 0xbd, 0x2e, 0x87, 0x0c, 0x37, 0xfb, 0xb3, 0x61, 0x98, 0x23,
+	0x04, 0x0c, 0xc3, 0xbc, 0xd6, 0xae, 0x1e, 0x7b, 0xaa, 0xe1, 0x99, 0xc7, 0x9e, 0xd7, 0xe0, 0xcd,
+	0x63, 0xcf, 0xed, 0x96, 0xb8, 0x84, 0xce, 0x60, 0x3b, 0x6c, 0x6a, 0xe8, 0x59, 0xb4, 0xd8, 0x74,
+	0x49, 0x7b, 0x3f, 0x69, 0x8c, 0x36, 0xbd, 0x81, 0xdd, 0x75, 0x5f, 0x41, 0x87, 0xeb, 0x35, 0x1b,
+	0x4d, 0xcf, 0xb6, 0xd2, 0x13, 0x11, 0xc0, 0x7b, 0x78, 0x92, 0x68, 0x02, 0xe8, 0x65, 0x74, 0x52,
+	0x46, 0x17, 0xb2, 0x5f, 0xe5, 0xcc, 0xc6, 0x53, 0xd6, 0x14, 0x67, 0x13, 0xc3, 0x54, 0xeb, 0x30,
+	0x31, 0xcc, 0xa8, 0xe5, 0x32, 0x19, 0xd2, 0xf5, 0xd5, 0x24, 0x43, 0x6e, 0xa5, 0x37, 0xc9, 0x90,
+	0x5f, 0x9e, 0x71, 0x69, 0x50, 0x95, 0x3f, 0x09, 0xce, 0xfe, 0x09, 0x00, 0x00, 0xff, 0xff, 0x04,
+	0x17, 0x81, 0x24, 0x56, 0x10, 0x00, 0x00,
 }
diff --git a/vendor/vendor.json b/vendor/vendor.json
index e3c060120..7b7042845 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -201,12 +201,12 @@
 			"revisionTime": "2017-01-30T11:31:45Z"
 		},
 		{
-			"checksumSHA1": "00Sa6h59cvGuEHvRvAdWY8htf3Y=",
+			"checksumSHA1": "uVABCa9KgeCWuCUox5jXmsUdyZE=",
 			"path": "gitlab.com/gitlab-org/gitaly-proto/go",
-			"revision": "5d01c463bf513e68a19560ff6d23df2a90a92732",
-			"revisionTime": "2018-01-08T17:25:43Z",
-			"version": "v0.67.0",
-			"versionExact": "v0.67.0"
+			"revision": "0de327f6149924d5de0e2e97513a01a362764296",
+			"revisionTime": "2018-01-08T21:12:14Z",
+			"version": "v0.68.0",
+			"versionExact": "v0.68.0"
 		},
 		{
 			"checksumSHA1": "nqWNlnMmVpt628zzvyo6Yv2CX5Q=",