Merge branch 'feature/implement-merge-base-rpc' into 'master'

Implement FindMergeBase RPC

Closes #809

See merge request gitlab-org/gitaly!477

10 files changed, 334 insertions, 78 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9fba29b11..d366ebfc6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 UNRELEASED
 
+- Implement FindMergeBase RPC
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/477
 - Update vendored gitlab_git to 359b65beac43e009b715c2db048e06b6f96b0ee8
   https://gitlab.com/gitlab-org/gitaly/merge_requests/481
 
diff --git a/internal/service/repository/merge_base.go b/internal/service/repository/merge_base.go
new file mode 100644
index 000000000..4dd156104
--- /dev/null
+++ b/internal/service/repository/merge_base.go
@@ -0,0 +1,29 @@
+package repository
+
+import (
+	"gitlab.com/gitlab-org/gitaly/internal/rubyserver"
+
+	pb "gitlab.com/gitlab-org/gitaly-proto/go"
+
+	"golang.org/x/net/context"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/codes"
+)
+
+func (s *server) FindMergeBase(ctx context.Context, req *pb.FindMergeBaseRequest) (*pb.FindMergeBaseResponse, error) {
+	if len(req.Revisions) != 2 {
+		return nil, grpc.Errorf(codes.InvalidArgument, "FindMergeBase: 2 revisions are required")
+	}
+
+	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.FindMergeBase(clientCtx, req)
+}
diff --git a/internal/service/repository/merge_base_test.go b/internal/service/repository/merge_base_test.go
new file mode 100644
index 000000000..4c429deae
--- /dev/null
+++ b/internal/service/repository/merge_base_test.go
@@ -0,0 +1,128 @@
+package repository
+
+import (
+	"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 TestSuccessfulFindFindMergeBaseRequest(t *testing.T) {
+	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
+		revisions [][]byte
+		base      string
+	}{
+		{
+			desc: "oid revisions",
+			revisions: [][]byte{
+				[]byte("372ab6950519549b14d220271ee2322caa44d4eb"),
+				[]byte("8a0f2ee90d940bfb0ba1e14e8214b0649056e4ab"),
+			},
+			base: "8a0f2ee90d940bfb0ba1e14e8214b0649056e4ab",
+		},
+		{
+			desc: "branch revisions",
+			revisions: [][]byte{
+				[]byte("master"),
+				[]byte("gitaly-stuff"),
+			},
+			base: "b83d6e391c22777fca1ed3012fce84f633d7fed0",
+		},
+		{
+			desc: "non-existent merge base",
+			revisions: [][]byte{
+				[]byte("master"),
+				[]byte("orphaned-branch"),
+			},
+			base: "",
+		},
+		{
+			desc: "non-existent branch",
+			revisions: [][]byte{
+				[]byte("master"),
+				[]byte("a-branch-that-does-not-exist"),
+			},
+			base: "",
+		},
+	}
+
+	for _, testCase := range testCases {
+		t.Run(testCase.desc, func(t *testing.T) {
+			ctx, cancel := testhelper.Context()
+			defer cancel()
+
+			request := &pb.FindMergeBaseRequest{
+				Repository: testRepo,
+				Revisions:  testCase.revisions,
+			}
+
+			response, err := client.FindMergeBase(ctx, request)
+			require.NoError(t, err)
+
+			require.Equal(t, testCase.base, response.Base)
+		})
+	}
+}
+
+func TestFailedFindMergeBaseRequestDueToValidations(t *testing.T) {
+	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
+		revisions [][]byte
+		code      codes.Code
+	}{
+		{
+			desc: "1 revision",
+			revisions: [][]byte{
+				[]byte("372ab6950519549b14d220271ee2322caa44d4eb"),
+			},
+			code: codes.InvalidArgument,
+		},
+		{
+			desc: "2+ revisions",
+			revisions: [][]byte{
+				[]byte("master"),
+				[]byte("gitaly-stuff"),
+				[]byte("spooky-stuff"),
+			},
+			code: codes.InvalidArgument,
+		},
+	}
+
+	for _, testCase := range testCases {
+		t.Run(testCase.desc, func(t *testing.T) {
+			ctx, cancel := testhelper.Context()
+			defer cancel()
+
+			request := &pb.FindMergeBaseRequest{
+				Repository: testRepo,
+				Revisions:  testCase.revisions,
+			}
+
+			_, err := client.FindMergeBase(ctx, request)
+			testhelper.AssertGrpcError(t, err, testCase.code, "")
+		})
+	}
+}
diff --git a/ruby/Gemfile b/ruby/Gemfile
index 5bb3d94d1..c7e97d6b0 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.60.0', require: 'gitaly'
+gem 'gitaly-proto', '~> 0.61.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 0318c2828..f58441829 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.60.0)
+    gitaly-proto (0.61.0)
       google-protobuf (~> 3.1)
       grpc (~> 1.0)
     github-linguist (4.7.6)
@@ -119,7 +119,7 @@ PLATFORMS
 
 DEPENDENCIES
   activesupport
-  gitaly-proto (~> 0.60.0)
+  gitaly-proto (~> 0.61.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 cd6d14ada..c698d569e 100644
--- a/ruby/lib/gitaly_server/repository_service.rb
+++ b/ruby/lib/gitaly_server/repository_service.rb
@@ -39,5 +39,18 @@ module GitalyServer
     rescue Rugged::RepositoryError => ex
       Gitaly::FsckResponse.new(error: ex.message.b)
     end
+
+    def find_merge_base(request, call)
+      bridge_exceptions do
+        begin
+          repo = Gitlab::Git::Repository.from_gitaly(request.repository, call)
+          base = repo.merge_base_commit(*request.revisions)
+
+          Gitaly::FindMergeBaseResponse.new(base: base.to_s)
+        rescue Rugged::ReferenceError
+          Gitaly::FindMergeBaseResponse.new
+        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 7e750b4eb..0b0945503 100644
--- a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION
+++ b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION
@@ -1 +1 @@
-0.60.0
+0.61.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 ea9da5217..223e17e09 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
@@ -159,6 +159,8 @@ It has these top-level messages:
 	FsckResponse
 	WriteRefRequest
 	WriteRefResponse
+	FindMergeBaseRequest
+	FindMergeBaseResponse
 	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 d936ba10d..cbeefde3e 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
@@ -621,6 +621,49 @@ func (m *WriteRefResponse) GetError() []byte {
 	return nil
 }
 
+type FindMergeBaseRequest struct {
+	Repository *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"`
+	// We use a repeated field because rugged supports finding a base
+	// for more than 2 revisions, so if we needed that in the future we don't
+	// need to change the protocol.
+	Revisions [][]byte `protobuf:"bytes,2,rep,name=revisions,proto3" json:"revisions,omitempty"`
+}
+
+func (m *FindMergeBaseRequest) Reset()                    { *m = FindMergeBaseRequest{} }
+func (m *FindMergeBaseRequest) String() string            { return proto.CompactTextString(m) }
+func (*FindMergeBaseRequest) ProtoMessage()               {}
+func (*FindMergeBaseRequest) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{30} }
+
+func (m *FindMergeBaseRequest) GetRepository() *Repository {
+	if m != nil {
+		return m.Repository
+	}
+	return nil
+}
+
+func (m *FindMergeBaseRequest) GetRevisions() [][]byte {
+	if m != nil {
+		return m.Revisions
+	}
+	return nil
+}
+
+type FindMergeBaseResponse struct {
+	Base string `protobuf:"bytes,1,opt,name=base" json:"base,omitempty"`
+}
+
+func (m *FindMergeBaseResponse) Reset()                    { *m = FindMergeBaseResponse{} }
+func (m *FindMergeBaseResponse) String() string            { return proto.CompactTextString(m) }
+func (*FindMergeBaseResponse) ProtoMessage()               {}
+func (*FindMergeBaseResponse) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{31} }
+
+func (m *FindMergeBaseResponse) GetBase() string {
+	if m != nil {
+		return m.Base
+	}
+	return ""
+}
+
 func init() {
 	proto.RegisterType((*RepositoryExistsRequest)(nil), "gitaly.RepositoryExistsRequest")
 	proto.RegisterType((*RepositoryExistsResponse)(nil), "gitaly.RepositoryExistsResponse")
@@ -652,6 +695,8 @@ func init() {
 	proto.RegisterType((*FsckResponse)(nil), "gitaly.FsckResponse")
 	proto.RegisterType((*WriteRefRequest)(nil), "gitaly.WriteRefRequest")
 	proto.RegisterType((*WriteRefResponse)(nil), "gitaly.WriteRefResponse")
+	proto.RegisterType((*FindMergeBaseRequest)(nil), "gitaly.FindMergeBaseRequest")
+	proto.RegisterType((*FindMergeBaseResponse)(nil), "gitaly.FindMergeBaseResponse")
 	proto.RegisterEnum("gitaly.GetArchiveRequest_Format", GetArchiveRequest_Format_name, GetArchiveRequest_Format_value)
 }
 
@@ -681,6 +726,7 @@ type RepositoryServiceClient interface {
 	FetchSourceBranch(ctx context.Context, in *FetchSourceBranchRequest, opts ...grpc.CallOption) (*FetchSourceBranchResponse, error)
 	Fsck(ctx context.Context, in *FsckRequest, opts ...grpc.CallOption) (*FsckResponse, error)
 	WriteRef(ctx context.Context, in *WriteRefRequest, opts ...grpc.CallOption) (*WriteRefResponse, error)
+	FindMergeBase(ctx context.Context, in *FindMergeBaseRequest, opts ...grpc.CallOption) (*FindMergeBaseResponse, error)
 }
 
 type repositoryServiceClient struct {
@@ -849,6 +895,15 @@ func (c *repositoryServiceClient) WriteRef(ctx context.Context, in *WriteRefRequ
 	return out, nil
 }
 
+func (c *repositoryServiceClient) FindMergeBase(ctx context.Context, in *FindMergeBaseRequest, opts ...grpc.CallOption) (*FindMergeBaseResponse, error) {
+	out := new(FindMergeBaseResponse)
+	err := grpc.Invoke(ctx, "/gitaly.RepositoryService/FindMergeBase", in, out, c.cc, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 // Server API for RepositoryService service
 
 type RepositoryServiceServer interface {
@@ -867,6 +922,7 @@ type RepositoryServiceServer interface {
 	FetchSourceBranch(context.Context, *FetchSourceBranchRequest) (*FetchSourceBranchResponse, error)
 	Fsck(context.Context, *FsckRequest) (*FsckResponse, error)
 	WriteRef(context.Context, *WriteRefRequest) (*WriteRefResponse, error)
+	FindMergeBase(context.Context, *FindMergeBaseRequest) (*FindMergeBaseResponse, error)
 }
 
 func RegisterRepositoryServiceServer(s *grpc.Server, srv RepositoryServiceServer) {
@@ -1146,6 +1202,24 @@ func _RepositoryService_WriteRef_Handler(srv interface{}, ctx context.Context, d
 	return interceptor(ctx, in, info, handler)
 }
 
+func _RepositoryService_FindMergeBase_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(FindMergeBaseRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(RepositoryServiceServer).FindMergeBase(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/gitaly.RepositoryService/FindMergeBase",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(RepositoryServiceServer).FindMergeBase(ctx, req.(*FindMergeBaseRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 var _RepositoryService_serviceDesc = grpc.ServiceDesc{
 	ServiceName: "gitaly.RepositoryService",
 	HandlerType: (*RepositoryServiceServer)(nil),
@@ -1206,6 +1280,10 @@ var _RepositoryService_serviceDesc = grpc.ServiceDesc{
 			MethodName: "WriteRef",
 			Handler:    _RepositoryService_WriteRef_Handler,
 		},
+		{
+			MethodName: "FindMergeBase",
+			Handler:    _RepositoryService_FindMergeBase_Handler,
+		},
 	},
 	Streams: []grpc.StreamDesc{
 		{
@@ -1220,73 +1298,77 @@ var _RepositoryService_serviceDesc = grpc.ServiceDesc{
 func init() { proto.RegisterFile("repository-service.proto", fileDescriptor9) }
 
 var fileDescriptor9 = []byte{
-	// 1082 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0xdd, 0x4e, 0xe3, 0xc6,
-	0x17, 0x4f, 0x08, 0x24, 0x70, 0xc8, 0xf2, 0x0f, 0xb3, 0x7c, 0x18, 0xb3, 0xfc, 0x97, 0x4e, 0x7b,
-	0xc1, 0x45, 0x8b, 0x56, 0x41, 0xaa, 0x7a, 0xb7, 0x02, 0xc4, 0x97, 0xb6, 0x8b, 0x5a, 0x83, 0x84,
-	0x84, 0x54, 0x59, 0x83, 0x99, 0x24, 0x16, 0x89, 0x27, 0x9d, 0x99, 0xc0, 0x66, 0xdf, 0xa0, 0xcf,
-	0xd7, 0x8b, 0x3e, 0x40, 0x2f, 0xfb, 0x12, 0x95, 0x67, 0x26, 0x1e, 0x3b, 0xb6, 0xb9, 0xb1, 0x7a,
-	0xe7, 0x39, 0x73, 0xe6, 0x77, 0x7e, 0x73, 0xe6, 0x7c, 0x19, 0x1c, 0x4e, 0xc7, 0x4c, 0x84, 0x92,
-	0xf1, 0xe9, 0x0f, 0x82, 0xf2, 0xe7, 0x30, 0xa0, 0x87, 0x63, 0xce, 0x24, 0x43, 0xcd, 0x7e, 0x28,
-	0xc9, 0x70, 0xea, 0xb6, 0xc5, 0x80, 0x70, 0xfa, 0xa8, 0xa5, 0xf8, 0x33, 0x6c, 0x7b, 0xc9, 0x89,
-	0xb3, 0x2f, 0xa1, 0x90, 0xc2, 0xa3, 0xbf, 0x4f, 0xa8, 0x90, 0xa8, 0x0b, 0x60, 0xc1, 0x9c, 0xfa,
-	0x7e, 0xfd, 0x60, 0xb5, 0x8b, 0x0e, 0x35, 0xca, 0xa1, 0x3d, 0xe4, 0xa5, 0xb4, 0x70, 0x17, 0x9c,
-	0x3c, 0x9c, 0x18, 0xb3, 0x48, 0x50, 0xb4, 0x05, 0x4d, 0xaa, 0x24, 0x0a, 0x6b, 0xd9, 0x33, 0x2b,
-	0x7c, 0x9d, 0x3e, 0x73, 0x25, 0xce, 0x46, 0x63, 0x39, 0xad, 0xc2, 0xe1, 0x47, 0xd8, 0x29, 0xc0,
-	0x33, 0x24, 0x76, 0x60, 0x39, 0x14, 0x3e, 0x8d, 0x65, 0x86, 0x46, 0x2b, 0xd4, 0x2a, 0x86, 0x07,
-	0x09, 0x9e, 0xae, 0xa2, 0x80, 0xd3, 0x11, 0x8d, 0x24, 0x19, 0x56, 0xe1, 0xb1, 0xab, 0x78, 0xcc,
-	0xe3, 0x69, 0x1e, 0x78, 0x08, 0xeb, 0x7a, 0xf3, 0x7c, 0x32, 0xac, 0x62, 0x05, 0x7d, 0x0b, 0x6f,
-	0x02, 0x4e, 0x89, 0xa4, 0xfe, 0x43, 0x28, 0x47, 0x64, 0xec, 0x2c, 0xa8, 0x5b, 0xb5, 0xb5, 0xf0,
-	0x44, 0xc9, 0xf0, 0x06, 0xa0, 0xb4, 0x35, 0xc3, 0x61, 0x0c, 0x9b, 0x17, 0x84, 0x3f, 0x90, 0x3e,
-	0x3d, 0x65, 0xc3, 0x21, 0x0d, 0xe4, 0x7f, 0xce, 0xc3, 0x81, 0xad, 0x79, 0x8b, 0x86, 0xcb, 0x27,
-	0xd8, 0xb4, 0xc0, 0x37, 0xe1, 0x57, 0x5a, 0xc5, 0xf3, 0xdf, 0xc3, 0xd6, 0x3c, 0x98, 0x79, 0x7e,
-	0x04, 0x8b, 0x22, 0xfc, 0x4a, 0x15, 0x4e, 0xc3, 0x53, 0xdf, 0xf8, 0x09, 0x76, 0x8e, 0xc7, 0xe3,
-	0xe1, 0xf4, 0x22, 0x94, 0x44, 0x4a, 0x1e, 0x3e, 0x4c, 0x24, 0xad, 0x92, 0x04, 0xc8, 0x85, 0x65,
-	0x4e, 0x9f, 0x43, 0x11, 0xb2, 0x48, 0x79, 0xa1, 0xed, 0x25, 0x6b, 0xfc, 0x0e, 0xdc, 0x22, 0x63,
-	0xc6, 0x0b, 0x7f, 0xd7, 0x01, 0x9d, 0x53, 0x19, 0x0c, 0x3c, 0x3a, 0x62, 0xb2, 0x8a, 0x0f, 0xe2,
-	0x6c, 0xe3, 0x0a, 0x44, 0x51, 0x58, 0xf1, 0xcc, 0x0a, 0x6d, 0xc0, 0x52, 0x8f, 0xf1, 0x80, 0x3a,
-	0x0d, 0xf5, 0x3e, 0x7a, 0x81, 0xb6, 0xa1, 0x15, 0x31, 0x5f, 0x92, 0xbe, 0x70, 0x16, 0x75, 0x72,
-	0x46, 0xec, 0x96, 0xf4, 0x05, 0x72, 0xa0, 0x25, 0xc3, 0x11, 0x65, 0x13, 0xe9, 0x2c, 0xed, 0xd7,
-	0x0f, 0x96, 0xbc, 0xd9, 0x32, 0x3e, 0x22, 0xc4, 0xc0, 0x7f, 0xa2, 0x53, 0xa7, 0xa9, 0x2d, 0x08,
-	0x31, 0xf8, 0x44, 0xa7, 0xe8, 0x3d, 0xac, 0x3e, 0x45, 0xec, 0x25, 0xf2, 0x07, 0x2c, 0x4e, 0xf6,
-	0x96, 0xda, 0x04, 0x25, 0xba, 0x8c, 0x25, 0x78, 0x13, 0xde, 0x66, 0x2e, 0x69, 0x2e, 0xff, 0x19,
-	0xb6, 0x4f, 0x55, 0xb0, 0xa4, 0x6e, 0x54, 0x21, 0x08, 0x5c, 0x70, 0xf2, 0x70, 0xc6, 0xd4, 0x3f,
-	0x75, 0x58, 0xbf, 0xa0, 0xf2, 0x98, 0x07, 0x83, 0xf0, 0xb9, 0x92, 0x9b, 0x77, 0x61, 0x25, 0x60,
-	0xa3, 0x51, 0x28, 0xfd, 0xf0, 0xd1, 0x78, 0x7a, 0x59, 0x0b, 0xae, 0x1e, 0xe3, 0x37, 0x18, 0x73,
-	0xda, 0x0b, 0xbf, 0x28, 0x67, 0xaf, 0x78, 0x66, 0x85, 0x7e, 0x82, 0x66, 0x8f, 0xf1, 0x11, 0x91,
-	0xca, 0xd9, 0x6b, 0xdd, 0xfd, 0x99, 0x91, 0x1c, 0xa7, 0xc3, 0x73, 0xa5, 0xe7, 0x19, 0x7d, 0x7c,
-	0x04, 0x4d, 0x2d, 0x41, 0x2d, 0x68, 0xdc, 0x5f, 0xfd, 0xd2, 0xa9, 0xc5, 0x1f, 0xb7, 0xc7, 0x5e,
-	0xa7, 0x8e, 0x00, 0x9a, 0xb7, 0xc7, 0x9e, 0x7f, 0x71, 0xdf, 0x59, 0x40, 0xab, 0xd0, 0x8a, 0xbf,
-	0x4f, 0xee, 0xbb, 0x9d, 0x06, 0x3e, 0x00, 0x94, 0x06, 0xb6, 0xa9, 0xf0, 0x48, 0x24, 0x51, 0xf7,
-	0x6c, 0x7b, 0xea, 0x3b, 0x7e, 0x82, 0x4b, 0x22, 0x7e, 0x66, 0x01, 0x19, 0x9e, 0x70, 0x12, 0x05,
-	0x83, 0x4a, 0x89, 0x80, 0x3f, 0x80, 0x93, 0x87, 0x33, 0xe6, 0x37, 0x60, 0xe9, 0x99, 0x0c, 0x27,
-	0xd4, 0x54, 0x61, 0xbd, 0xc0, 0x12, 0x36, 0x4e, 0x07, 0x24, 0xea, 0xd3, 0x1b, 0xc9, 0x38, 0xe9,
-	0x57, 0x7a, 0x9a, 0x03, 0xe8, 0x44, 0xf4, 0xc5, 0x17, 0x1a, 0xc9, 0x8f, 0xc8, 0x68, 0x96, 0x0b,
-	0x6b, 0x11, 0x7d, 0x31, 0x06, 0xae, 0xc9, 0x88, 0xe2, 0x6d, 0xd8, 0x9c, 0xb3, 0x6a, 0xe2, 0xe4,
-	0xcf, 0x3a, 0x38, 0x2a, 0x54, 0x6f, 0xd8, 0x84, 0x07, 0x54, 0x5f, 0xa2, 0x0a, 0xa7, 0x8f, 0xb0,
-	0x2e, 0x14, 0x94, 0x9f, 0x3a, 0xba, 0x50, 0x7a, 0xb4, 0xa3, 0x95, 0xbd, 0x4c, 0x99, 0x35, 0x00,
-	0x0f, 0x8a, 0x8c, 0x8a, 0xac, 0xb6, 0xd7, 0x16, 0x29, 0x82, 0x68, 0x0f, 0x40, 0x12, 0xde, 0xa7,
-	0xd2, 0xe7, 0xb4, 0xa7, 0x62, 0xac, 0xed, 0xad, 0x68, 0x89, 0x47, 0x7b, 0xf8, 0x08, 0x76, 0x0a,
-	0x2e, 0x65, 0xbb, 0x34, 0xa7, 0x62, 0x32, 0x94, 0xb3, 0x2e, 0xad, 0x57, 0xf8, 0x18, 0x56, 0xcf,
-	0x45, 0xf0, 0x54, 0x25, 0x1c, 0xbe, 0x83, 0xb6, 0x86, 0xb0, 0x21, 0x40, 0x39, 0x67, 0xdc, 0x84,
-	0xa0, 0x5e, 0xe0, 0x3f, 0xea, 0xf0, 0xbf, 0x3b, 0x1e, 0xc6, 0x79, 0xdb, 0xab, 0xe2, 0xea, 0x0e,
-	0x34, 0xe2, 0xdb, 0xeb, 0x02, 0x1c, 0x7f, 0x66, 0xea, 0x72, 0x23, 0x5b, 0x97, 0x6d, 0x59, 0x5c,
-	0x4c, 0x95, 0x45, 0x7c, 0x00, 0x1d, 0x4b, 0xe5, 0x35, 0xd6, 0xdd, 0xbf, 0x56, 0x54, 0x43, 0x9f,
-	0xf5, 0x1c, 0x3d, 0x79, 0xa1, 0x3b, 0xe8, 0xcc, 0x8f, 0x43, 0xe8, 0x7d, 0x9e, 0x77, 0x66, 0xee,
-	0x72, 0xf7, 0xcb, 0x15, 0x4c, 0x58, 0xd6, 0xd0, 0x7d, 0xda, 0x9a, 0x99, 0x71, 0x50, 0xc1, 0xc1,
-	0xec, 0x38, 0xe5, 0x7e, 0xf3, 0x8a, 0xc6, 0x1c, 0x76, 0x76, 0x6e, 0xc9, 0x60, 0x17, 0x8e, 0x48,
-	0x19, 0xec, 0x92, 0xa1, 0xa7, 0x86, 0xce, 0x00, 0xec, 0x20, 0x82, 0x76, 0xb2, 0x47, 0x52, 0xa3,
-	0x90, 0xeb, 0x16, 0x6d, 0x25, 0x30, 0xbf, 0xc2, 0x5a, 0x76, 0x8e, 0x40, 0x7b, 0x49, 0x09, 0x2d,
-	0x9a, 0x68, 0xdc, 0xff, 0x97, 0x6d, 0xa7, 0x21, 0xb3, 0x33, 0x83, 0x85, 0x2c, 0x1c, 0x4c, 0x2c,
-	0x64, 0xf1, 0xa8, 0x81, 0x6b, 0xe8, 0x37, 0x40, 0xf9, 0x5e, 0x8f, 0x12, 0x3f, 0x95, 0x0e, 0x1d,
-	0x2e, 0x7e, 0x4d, 0x25, 0x81, 0xbf, 0x84, 0xd5, 0x54, 0x1b, 0x45, 0x89, 0xc7, 0xf2, 0x03, 0x84,
-	0xbb, 0x5b, 0xb8, 0x97, 0x20, 0xdd, 0x41, 0x67, 0xbe, 0x55, 0xda, 0x30, 0x2d, 0xe9, 0xc9, 0x36,
-	0x4c, 0x4b, 0xbb, 0x6c, 0x0d, 0x5d, 0x00, 0xd8, 0xce, 0x63, 0x9f, 0x3b, 0xd7, 0xe6, 0xec, 0x73,
-	0xe7, 0x1b, 0x15, 0xae, 0x7d, 0xa8, 0xc7, 0x0c, 0xe7, 0x3b, 0x89, 0x65, 0x58, 0xd2, 0xb2, 0x2c,
-	0xc3, 0xb2, 0x26, 0x84, 0x6b, 0xe8, 0x1a, 0xde, 0x64, 0x4a, 0x3f, 0x7a, 0x97, 0x5c, 0xab, 0xa0,
-	0x0f, 0xb9, 0x7b, 0x25, 0xbb, 0xe9, 0xe4, 0xc9, 0xd5, 0x56, 0x9b, 0x3c, 0x65, 0xbd, 0xc4, 0x26,
-	0x4f, 0x69, 0x61, 0xc6, 0x35, 0x74, 0x04, 0x8b, 0x71, 0xfd, 0x44, 0x6f, 0x13, 0x65, 0x5b, 0x90,
-	0xdd, 0x8d, 0xac, 0x30, 0x39, 0xf4, 0x11, 0x96, 0x67, 0x25, 0x0c, 0x6d, 0xcf, 0x74, 0xe6, 0xea,
-	0xab, 0xeb, 0xe4, 0x37, 0x66, 0x00, 0x0f, 0x4d, 0xf5, 0xa3, 0x78, 0xf4, 0x6f, 0x00, 0x00, 0x00,
-	0xff, 0xff, 0xaa, 0x2b, 0x6d, 0x5f, 0x5a, 0x0e, 0x00, 0x00,
+	// 1137 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0xdd, 0x4e, 0xe3, 0x46,
+	0x14, 0x4e, 0x08, 0x24, 0xe4, 0x90, 0xdd, 0x86, 0xd9, 0x00, 0xc6, 0x40, 0x97, 0x4e, 0x7b, 0x81,
+	0xd4, 0x16, 0xad, 0x82, 0x54, 0xf5, 0x6e, 0x05, 0x88, 0x3f, 0x6d, 0x41, 0xad, 0x41, 0x42, 0x42,
+	0xaa, 0xac, 0x89, 0x99, 0x24, 0x16, 0x89, 0x9d, 0xce, 0x4c, 0x60, 0xb3, 0x6f, 0xd0, 0x27, 0xe9,
+	0x03, 0xf5, 0x11, 0x7a, 0xd9, 0x97, 0xa8, 0x3c, 0x33, 0xf1, 0xd8, 0xb1, 0xcd, 0x8d, 0xd5, 0x3b,
+	0xcf, 0x99, 0x33, 0xdf, 0xf9, 0xe6, 0xcc, 0xf9, 0x33, 0x58, 0x8c, 0x4e, 0x42, 0xee, 0x8b, 0x90,
+	0xcd, 0x7e, 0xe4, 0x94, 0x3d, 0xfb, 0x1e, 0x3d, 0x9c, 0xb0, 0x50, 0x84, 0xa8, 0x3e, 0xf0, 0x05,
+	0x19, 0xcd, 0xec, 0x16, 0x1f, 0x12, 0x46, 0x1f, 0x95, 0x14, 0x5f, 0xc3, 0x96, 0x13, 0x9f, 0x38,
+	0xfb, 0xec, 0x73, 0xc1, 0x1d, 0xfa, 0xc7, 0x94, 0x72, 0x81, 0xba, 0x00, 0x06, 0xcc, 0xaa, 0xee,
+	0x57, 0x0f, 0xd6, 0xba, 0xe8, 0x50, 0xa1, 0x1c, 0x9a, 0x43, 0x4e, 0x42, 0x0b, 0x77, 0xc1, 0xca,
+	0xc2, 0xf1, 0x49, 0x18, 0x70, 0x8a, 0x36, 0xa1, 0x4e, 0xa5, 0x44, 0x62, 0xad, 0x3a, 0x7a, 0x85,
+	0x6f, 0x92, 0x67, 0xae, 0xf8, 0xd9, 0x78, 0x22, 0x66, 0x65, 0x38, 0xfc, 0x04, 0xdb, 0x39, 0x78,
+	0x9a, 0xc4, 0x36, 0xac, 0xfa, 0xdc, 0xa5, 0x91, 0x4c, 0xd3, 0x68, 0xf8, 0x4a, 0x45, 0xf3, 0x20,
+	0xde, 0xd3, 0x55, 0xe0, 0x31, 0x3a, 0xa6, 0x81, 0x20, 0xa3, 0x32, 0x3c, 0x76, 0x24, 0x8f, 0x45,
+	0x3c, 0xc5, 0x03, 0x8f, 0x60, 0x5d, 0x6d, 0x9e, 0x4f, 0x47, 0x65, 0xac, 0xa0, 0x6f, 0xe1, 0x8d,
+	0xc7, 0x28, 0x11, 0xd4, 0xed, 0xf9, 0x62, 0x4c, 0x26, 0xd6, 0x92, 0xbc, 0x55, 0x4b, 0x09, 0x4f,
+	0xa4, 0x0c, 0x77, 0x00, 0x25, 0xad, 0x69, 0x0e, 0x13, 0xd8, 0xb8, 0x20, 0xac, 0x47, 0x06, 0xf4,
+	0x34, 0x1c, 0x8d, 0xa8, 0x27, 0xfe, 0x77, 0x1e, 0x16, 0x6c, 0x2e, 0x5a, 0xd4, 0x5c, 0x3e, 0xc1,
+	0x86, 0x01, 0xbe, 0xf5, 0xbf, 0xd0, 0x32, 0x9e, 0xff, 0x01, 0x36, 0x17, 0xc1, 0xf4, 0xf3, 0x23,
+	0x58, 0xe6, 0xfe, 0x17, 0x2a, 0x71, 0x6a, 0x8e, 0xfc, 0xc6, 0x4f, 0xb0, 0x7d, 0x3c, 0x99, 0x8c,
+	0x66, 0x17, 0xbe, 0x20, 0x42, 0x30, 0xbf, 0x37, 0x15, 0xb4, 0x4c, 0x12, 0x20, 0x1b, 0x56, 0x19,
+	0x7d, 0xf6, 0xb9, 0x1f, 0x06, 0xd2, 0x0b, 0x2d, 0x27, 0x5e, 0xe3, 0x5d, 0xb0, 0xf3, 0x8c, 0x69,
+	0x2f, 0xfc, 0x53, 0x05, 0x74, 0x4e, 0x85, 0x37, 0x74, 0xe8, 0x38, 0x14, 0x65, 0x7c, 0x10, 0x65,
+	0x1b, 0x93, 0x20, 0x92, 0x42, 0xd3, 0xd1, 0x2b, 0xd4, 0x81, 0x95, 0x7e, 0xc8, 0x3c, 0x6a, 0xd5,
+	0xe4, 0xfb, 0xa8, 0x05, 0xda, 0x82, 0x46, 0x10, 0xba, 0x82, 0x0c, 0xb8, 0xb5, 0xac, 0x92, 0x33,
+	0x08, 0xef, 0xc8, 0x80, 0x23, 0x0b, 0x1a, 0xc2, 0x1f, 0xd3, 0x70, 0x2a, 0xac, 0x95, 0xfd, 0xea,
+	0xc1, 0x8a, 0x33, 0x5f, 0x46, 0x47, 0x38, 0x1f, 0xba, 0x4f, 0x74, 0x66, 0xd5, 0x95, 0x05, 0xce,
+	0x87, 0x9f, 0xe8, 0x0c, 0xbd, 0x87, 0xb5, 0xa7, 0x20, 0x7c, 0x09, 0xdc, 0x61, 0x18, 0x25, 0x7b,
+	0x43, 0x6e, 0x82, 0x14, 0x5d, 0x46, 0x12, 0xbc, 0x01, 0xef, 0x52, 0x97, 0xd4, 0x97, 0xbf, 0x86,
+	0xad, 0x53, 0x19, 0x2c, 0x89, 0x1b, 0x95, 0x08, 0x02, 0x1b, 0xac, 0x2c, 0x9c, 0x36, 0xf5, 0x6f,
+	0x15, 0xd6, 0x2f, 0xa8, 0x38, 0x66, 0xde, 0xd0, 0x7f, 0x2e, 0xe5, 0xe6, 0x1d, 0x68, 0x7a, 0xe1,
+	0x78, 0xec, 0x0b, 0xd7, 0x7f, 0xd4, 0x9e, 0x5e, 0x55, 0x82, 0xab, 0xc7, 0xe8, 0x0d, 0x26, 0x8c,
+	0xf6, 0xfd, 0xcf, 0xd2, 0xd9, 0x4d, 0x47, 0xaf, 0xd0, 0xcf, 0x50, 0xef, 0x87, 0x6c, 0x4c, 0x84,
+	0x74, 0xf6, 0xdb, 0xee, 0xfe, 0xdc, 0x48, 0x86, 0xd3, 0xe1, 0xb9, 0xd4, 0x73, 0xb4, 0x3e, 0x3e,
+	0x82, 0xba, 0x92, 0xa0, 0x06, 0xd4, 0x1e, 0xae, 0x7e, 0x6d, 0x57, 0xa2, 0x8f, 0xbb, 0x63, 0xa7,
+	0x5d, 0x45, 0x00, 0xf5, 0xbb, 0x63, 0xc7, 0xbd, 0x78, 0x68, 0x2f, 0xa1, 0x35, 0x68, 0x44, 0xdf,
+	0x27, 0x0f, 0xdd, 0x76, 0x0d, 0x1f, 0x00, 0x4a, 0x02, 0x9b, 0x54, 0x78, 0x24, 0x82, 0xc8, 0x7b,
+	0xb6, 0x1c, 0xf9, 0x1d, 0x3d, 0xc1, 0x25, 0xe1, 0xbf, 0x84, 0x1e, 0x19, 0x9d, 0x30, 0x12, 0x78,
+	0xc3, 0x52, 0x89, 0x80, 0x3f, 0x80, 0x95, 0x85, 0xd3, 0xe6, 0x3b, 0xb0, 0xf2, 0x4c, 0x46, 0x53,
+	0xaa, 0xab, 0xb0, 0x5a, 0x60, 0x01, 0x9d, 0xd3, 0x21, 0x09, 0x06, 0xf4, 0x56, 0x84, 0x8c, 0x0c,
+	0x4a, 0x3d, 0xcd, 0x01, 0xb4, 0x03, 0xfa, 0xe2, 0x72, 0x85, 0xe4, 0x06, 0x64, 0x3c, 0xcf, 0x85,
+	0xb7, 0x01, 0x7d, 0xd1, 0x06, 0x6e, 0xc8, 0x98, 0xe2, 0x2d, 0xd8, 0x58, 0xb0, 0xaa, 0xe3, 0xe4,
+	0xef, 0x2a, 0x58, 0x32, 0x54, 0x6f, 0xc3, 0x29, 0xf3, 0xa8, 0xba, 0x44, 0x19, 0x4e, 0x1f, 0x61,
+	0x9d, 0x4b, 0x28, 0x37, 0x71, 0x74, 0xa9, 0xf0, 0x68, 0x5b, 0x29, 0x3b, 0xa9, 0x32, 0xab, 0x01,
+	0x7a, 0x92, 0x8c, 0x8c, 0xac, 0x96, 0xd3, 0xe2, 0x09, 0x82, 0x68, 0x0f, 0x40, 0x10, 0x36, 0xa0,
+	0xc2, 0x65, 0xb4, 0x2f, 0x63, 0xac, 0xe5, 0x34, 0x95, 0xc4, 0xa1, 0x7d, 0x7c, 0x04, 0xdb, 0x39,
+	0x97, 0x32, 0x5d, 0x9a, 0x51, 0x3e, 0x1d, 0x89, 0x79, 0x97, 0x56, 0x2b, 0x7c, 0x0c, 0x6b, 0xe7,
+	0xdc, 0x7b, 0x2a, 0x13, 0x0e, 0xdf, 0x41, 0x4b, 0x41, 0x98, 0x10, 0xa0, 0x8c, 0x85, 0x4c, 0x87,
+	0xa0, 0x5a, 0xe0, 0x3f, 0xab, 0xf0, 0xd5, 0x3d, 0xf3, 0xa3, 0xbc, 0xed, 0x97, 0x71, 0x75, 0x1b,
+	0x6a, 0xd1, 0xed, 0x55, 0x01, 0x8e, 0x3e, 0x53, 0x75, 0xb9, 0x96, 0xae, 0xcb, 0xa6, 0x2c, 0x2e,
+	0x27, 0xca, 0x22, 0x3e, 0x80, 0xb6, 0xa1, 0xf2, 0x2a, 0xeb, 0x21, 0x74, 0xce, 0xfd, 0xe0, 0xf1,
+	0x9a, 0xb2, 0x01, 0x3d, 0x21, 0xbc, 0x54, 0xe0, 0xee, 0x42, 0x73, 0xce, 0x8b, 0x5b, 0x4b, 0xfb,
+	0xb5, 0xe8, 0xf5, 0x62, 0x01, 0xfe, 0x1e, 0x36, 0x16, 0x2c, 0x99, 0x84, 0xee, 0x11, 0xae, 0x12,
+	0xaa, 0xe9, 0xc8, 0xef, 0xee, 0x5f, 0x20, 0xe7, 0x8c, 0x79, 0x2b, 0x54, 0x03, 0x21, 0xba, 0x87,
+	0xf6, 0xe2, 0x94, 0x86, 0xde, 0x67, 0x49, 0xa5, 0xc6, 0x41, 0x7b, 0xbf, 0x58, 0x41, 0x67, 0x4b,
+	0x05, 0x3d, 0x24, 0xad, 0xe9, 0xd1, 0x0b, 0xe5, 0x1c, 0x4c, 0x4f, 0x79, 0xf6, 0x37, 0xaf, 0x68,
+	0x2c, 0x60, 0xa7, 0xc7, 0xa9, 0x14, 0x76, 0xee, 0xe4, 0x96, 0xc2, 0x2e, 0x98, 0xc5, 0x2a, 0xe8,
+	0x0c, 0xc0, 0xcc, 0x47, 0x68, 0x3b, 0x7d, 0x24, 0x31, 0xa1, 0xd9, 0x76, 0xde, 0x56, 0x0c, 0xf3,
+	0x1b, 0xbc, 0x4d, 0x8f, 0x37, 0x68, 0x2f, 0xae, 0xec, 0x79, 0x83, 0x96, 0xfd, 0x75, 0xd1, 0x76,
+	0x12, 0x32, 0x3d, 0xca, 0x18, 0xc8, 0xdc, 0x79, 0xc9, 0x40, 0xe6, 0x4f, 0x40, 0xb8, 0x82, 0x7e,
+	0x07, 0x94, 0x1d, 0x41, 0x50, 0xec, 0xa7, 0xc2, 0x59, 0xc8, 0xc6, 0xaf, 0xa9, 0xc4, 0xf0, 0x97,
+	0xb0, 0x96, 0xe8, 0xee, 0x28, 0xf6, 0x58, 0x76, 0xae, 0xb1, 0x77, 0x72, 0xf7, 0x62, 0xa4, 0x7b,
+	0x68, 0x2f, 0x76, 0x70, 0x13, 0xa6, 0x05, 0xa3, 0x82, 0x09, 0xd3, 0xc2, 0xe6, 0x5f, 0x41, 0x17,
+	0x00, 0xa6, 0x21, 0x9a, 0xe7, 0xce, 0x74, 0x5f, 0xf3, 0xdc, 0xd9, 0xfe, 0x89, 0x2b, 0x1f, 0xaa,
+	0x11, 0xc3, 0xc5, 0x06, 0x67, 0x18, 0x16, 0x74, 0x52, 0xc3, 0xb0, 0xa8, 0x37, 0xe2, 0x0a, 0xba,
+	0x81, 0x37, 0xa9, 0x8e, 0x84, 0x76, 0xe3, 0x6b, 0xe5, 0xb4, 0x47, 0x7b, 0xaf, 0x60, 0x37, 0x99,
+	0x3c, 0x99, 0x92, 0x6f, 0x92, 0xa7, 0xa8, 0xc5, 0x99, 0xe4, 0x29, 0xec, 0x17, 0xb8, 0x82, 0x8e,
+	0x60, 0x39, 0x2a, 0xeb, 0xe8, 0x5d, 0xac, 0x6c, 0xfa, 0x84, 0xdd, 0x49, 0x0b, 0xe3, 0x43, 0x1f,
+	0x61, 0x75, 0x5e, 0x59, 0xd1, 0xd6, 0x5c, 0x67, 0xa1, 0xec, 0xdb, 0x56, 0x76, 0x23, 0xe9, 0xa1,
+	0x54, 0x19, 0x34, 0x1e, 0xca, 0xab, 0xc3, 0xc6, 0x43, 0xb9, 0xb5, 0x13, 0x57, 0x7a, 0x75, 0xf9,
+	0x3f, 0x7c, 0xf4, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xd0, 0x95, 0x78, 0xf8, 0x41, 0x0f, 0x00,
+	0x00,
 }
diff --git a/vendor/vendor.json b/vendor/vendor.json
index 2ccb6a096..daf5d0855 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -201,12 +201,12 @@
 			"revisionTime": "2017-01-30T11:31:45Z"
 		},
 		{
-			"checksumSHA1": "XMylANBPKE261AGhHeksUFRC7KQ=",
+			"checksumSHA1": "jTJBhnPKmona+1U7mbfFjodrGUQ=",
 			"path": "gitlab.com/gitlab-org/gitaly-proto/go",
-			"revision": "21e2d599e812e4b55a902e7d48ea4a3618674b16",
-			"revisionTime": "2017-12-07T16:49:09Z",
-			"version": "v0.60.0",
-			"versionExact": "v0.60.0"
+			"revision": "a74d4f2565d3461fa699f1d58df099a06f3a631c",
+			"revisionTime": "2017-12-08T15:42:58Z",
+			"version": "v0.61.0",
+			"versionExact": "v0.61.0"
 		},
 		{
 			"checksumSHA1": "nqWNlnMmVpt628zzvyo6Yv2CX5Q=",