Use gitaly-proto 0.42.0

11 files changed, 485 insertions, 68 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c8af2663a..2a98b6b70 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Gitaly changelog
 
+UNRELEASED
+
+- Use gitaly-proto 0.42.0
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/407
+
 v0.46.0
 
 - Add a Rails logger to ruby-git
diff --git a/internal/service/blob/get_blobs.go b/internal/service/blob/get_blobs.go
new file mode 100644
index 000000000..951b28610
--- /dev/null
+++ b/internal/service/blob/get_blobs.go
@@ -0,0 +1,10 @@
+package blob
+
+import (
+	pb "gitlab.com/gitlab-org/gitaly-proto/go"
+	"gitlab.com/gitlab-org/gitaly/internal/helper"
+)
+
+func (*server) GetBlobs(*pb.GetBlobsRequest, pb.BlobService_GetBlobsServer) error {
+	return helper.Unimplemented
+}
diff --git a/internal/service/operations/merge_test.go b/internal/service/operations/merge_test.go
index 2793dcc7d..fd0574fcf 100644
--- a/internal/service/operations/merge_test.go
+++ b/internal/service/operations/merge_test.go
@@ -75,7 +75,7 @@ func TestSuccessfulMerge(t *testing.T) {
 
 	secondResponse, err := mergeBidi.Recv()
 	require.NoError(t, err, "receive second response")
-	require.Equal(t, pb.UserMergeBranchResponse{Applied: true}, *secondResponse)
+	require.NotEqual(t, pb.UserMergeBranchResponse{}, *secondResponse, "second response should not be empty")
 
 	err = consumeEOF(func() error {
 		_, err = mergeBidi.Recv()
@@ -158,7 +158,9 @@ func TestAbortedMerge(t *testing.T) {
 				t.Fatal(err)
 			}
 
-			require.Equal(t, false, secondResponse.GetApplied(), "merge should not have been applied")
+			if secondResponse != nil {
+				require.NotEqual(t, pb.UserMergeBranchResponse{}, *secondResponse, "second response should be empty")
+			}
 			require.Error(t, err)
 
 			commit, err := gitlog.GetCommit(ctx, testRepo, mergeBranchName, "")
diff --git a/ruby/Gemfile b/ruby/Gemfile
index 6899018ca..d89e5ea8a 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.41.0', require: 'gitaly'
+gem 'gitaly-proto', '~> 0.42.0', require: 'gitaly'
 gem 'activesupport'
 
 group :development, :test do
diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock
index b23bace3e..4af6d3b46 100644
--- a/ruby/Gemfile.lock
+++ b/ruby/Gemfile.lock
@@ -14,7 +14,7 @@ GEM
     escape_utils (1.1.1)
     faraday (0.12.2)
       multipart-post (>= 1.2, < 3)
-    gitaly-proto (0.41.0)
+    gitaly-proto (0.42.0)
       google-protobuf (~> 3.1)
       grpc (~> 1.0)
     github-linguist (4.7.6)
@@ -88,7 +88,7 @@ PLATFORMS
 
 DEPENDENCIES
   activesupport
-  gitaly-proto (~> 0.41.0)
+  gitaly-proto (~> 0.42.0)
   github-linguist (~> 4.7.0)
   gitlab-styles (~> 2.0.0)
 
diff --git a/ruby/lib/gitaly_server/operations_service.rb b/ruby/lib/gitaly_server/operations_service.rb
index 6359327e5..988d3be1e 100644
--- a/ruby/lib/gitaly_server/operations_service.rb
+++ b/ruby/lib/gitaly_server/operations_service.rb
@@ -113,7 +113,9 @@ module GitalyServer
           target_branch = first_request.branch.dup
           message = first_request.message.dup
 
+          merge_commit_id = nil
           repository.merge(user, source_sha, target_branch, message) do |commit_id|
+            merge_commit_id = commit_id
             y << Gitaly::UserMergeBranchResponse.new(commit_id: commit_id)
 
             second_request = session.next
@@ -122,7 +124,7 @@ module GitalyServer
             end
           end
 
-          y << Gitaly::UserMergeBranchResponse.new(applied: true)
+          y << Gitaly::UserMergeBranchResponse.new(branch_update: Gitaly::OperationBranchUpdate.new(commit_id: merge_commit_id))
         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 72a8a6313..787ffc30a 100644
--- a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION
+++ b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION
@@ -1 +1 @@
-0.41.0
+0.42.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 d5c57b268..cc0d59df0 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
@@ -17,10 +17,13 @@ It is generated from these files:
 	shared.proto
 	smarthttp.proto
 	ssh.proto
+	wiki.proto
 
 It has these top-level messages:
 	GetBlobRequest
 	GetBlobResponse
+	GetBlobsRequest
+	GetBlobsResponse
 	CommitStatsRequest
 	CommitStatsResponse
 	CommitIsAncestorRequest
@@ -81,6 +84,7 @@ It has these top-level messages:
 	UserCreateTagResponse
 	UserMergeBranchRequest
 	UserMergeBranchResponse
+	OperationBranchUpdate
 	FindDefaultBranchNameRequest
 	FindDefaultBranchNameResponse
 	FindAllBranchNamesRequest
@@ -142,6 +146,9 @@ It has these top-level messages:
 	SSHUploadPackResponse
 	SSHReceivePackRequest
 	SSHReceivePackResponse
+	WikiPageVersion
+	WikiGetPageVersionsRequest
+	WikiGetPageVersionsResponse
 */
 package gitaly
 
@@ -234,9 +241,80 @@ func (m *GetBlobResponse) GetOid() string {
 	return ""
 }
 
+type GetBlobsRequest struct {
+	Repository *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"`
+	// Object IDs (SHA1) of the blobs we want to get
+	Oids []string `protobuf:"bytes,2,rep,name=oids" json:"oids,omitempty"`
+	// Maximum number of bytes we want to receive. Use '-1' to get the full blobs no matter how big.
+	Limit int64 `protobuf:"varint,3,opt,name=limit" json:"limit,omitempty"`
+}
+
+func (m *GetBlobsRequest) Reset()                    { *m = GetBlobsRequest{} }
+func (m *GetBlobsRequest) String() string            { return proto.CompactTextString(m) }
+func (*GetBlobsRequest) ProtoMessage()               {}
+func (*GetBlobsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+
+func (m *GetBlobsRequest) GetRepository() *Repository {
+	if m != nil {
+		return m.Repository
+	}
+	return nil
+}
+
+func (m *GetBlobsRequest) GetOids() []string {
+	if m != nil {
+		return m.Oids
+	}
+	return nil
+}
+
+func (m *GetBlobsRequest) GetLimit() int64 {
+	if m != nil {
+		return m.Limit
+	}
+	return 0
+}
+
+type GetBlobsResponse struct {
+	// Blob size; present only on the first message per blob
+	Size int64 `protobuf:"varint,1,opt,name=size" json:"size,omitempty"`
+	// Chunk of blob data
+	Data []byte `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"`
+	// Object ID of the current blob. Only present on the first message per blob. Empty if no blob was found.
+	Oid string `protobuf:"bytes,3,opt,name=oid" json:"oid,omitempty"`
+}
+
+func (m *GetBlobsResponse) Reset()                    { *m = GetBlobsResponse{} }
+func (m *GetBlobsResponse) String() string            { return proto.CompactTextString(m) }
+func (*GetBlobsResponse) ProtoMessage()               {}
+func (*GetBlobsResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+
+func (m *GetBlobsResponse) GetSize() int64 {
+	if m != nil {
+		return m.Size
+	}
+	return 0
+}
+
+func (m *GetBlobsResponse) GetData() []byte {
+	if m != nil {
+		return m.Data
+	}
+	return nil
+}
+
+func (m *GetBlobsResponse) GetOid() string {
+	if m != nil {
+		return m.Oid
+	}
+	return ""
+}
+
 func init() {
 	proto.RegisterType((*GetBlobRequest)(nil), "gitaly.GetBlobRequest")
 	proto.RegisterType((*GetBlobResponse)(nil), "gitaly.GetBlobResponse")
+	proto.RegisterType((*GetBlobsRequest)(nil), "gitaly.GetBlobsRequest")
+	proto.RegisterType((*GetBlobsResponse)(nil), "gitaly.GetBlobsResponse")
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -254,6 +332,11 @@ type BlobServiceClient interface {
 	// ID. We use a stream to return a chunked arbitrarily large binary
 	// response
 	GetBlob(ctx context.Context, in *GetBlobRequest, opts ...grpc.CallOption) (BlobService_GetBlobClient, error)
+	// GetBlobsBySHA returns the contents of a blob objects referenced by their object
+	// ID. We use a stream to return a chunked arbitrarily large binary response.
+	// The blobs are sent in a continous stream, the caller is responsible for spliting
+	// them up into multiple blobs by their object IDs.
+	GetBlobs(ctx context.Context, in *GetBlobsRequest, opts ...grpc.CallOption) (BlobService_GetBlobsClient, error)
 }
 
 type blobServiceClient struct {
@@ -296,6 +379,38 @@ func (x *blobServiceGetBlobClient) Recv() (*GetBlobResponse, error) {
 	return m, nil
 }
 
+func (c *blobServiceClient) GetBlobs(ctx context.Context, in *GetBlobsRequest, opts ...grpc.CallOption) (BlobService_GetBlobsClient, error) {
+	stream, err := grpc.NewClientStream(ctx, &_BlobService_serviceDesc.Streams[1], c.cc, "/gitaly.BlobService/GetBlobs", opts...)
+	if err != nil {
+		return nil, err
+	}
+	x := &blobServiceGetBlobsClient{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 BlobService_GetBlobsClient interface {
+	Recv() (*GetBlobsResponse, error)
+	grpc.ClientStream
+}
+
+type blobServiceGetBlobsClient struct {
+	grpc.ClientStream
+}
+
+func (x *blobServiceGetBlobsClient) Recv() (*GetBlobsResponse, error) {
+	m := new(GetBlobsResponse)
+	if err := x.ClientStream.RecvMsg(m); err != nil {
+		return nil, err
+	}
+	return m, nil
+}
+
 // Server API for BlobService service
 
 type BlobServiceServer interface {
@@ -303,6 +418,11 @@ type BlobServiceServer interface {
 	// ID. We use a stream to return a chunked arbitrarily large binary
 	// response
 	GetBlob(*GetBlobRequest, BlobService_GetBlobServer) error
+	// GetBlobsBySHA returns the contents of a blob objects referenced by their object
+	// ID. We use a stream to return a chunked arbitrarily large binary response.
+	// The blobs are sent in a continous stream, the caller is responsible for spliting
+	// them up into multiple blobs by their object IDs.
+	GetBlobs(*GetBlobsRequest, BlobService_GetBlobsServer) error
 }
 
 func RegisterBlobServiceServer(s *grpc.Server, srv BlobServiceServer) {
@@ -330,6 +450,27 @@ func (x *blobServiceGetBlobServer) Send(m *GetBlobResponse) error {
 	return x.ServerStream.SendMsg(m)
 }
 
+func _BlobService_GetBlobs_Handler(srv interface{}, stream grpc.ServerStream) error {
+	m := new(GetBlobsRequest)
+	if err := stream.RecvMsg(m); err != nil {
+		return err
+	}
+	return srv.(BlobServiceServer).GetBlobs(m, &blobServiceGetBlobsServer{stream})
+}
+
+type BlobService_GetBlobsServer interface {
+	Send(*GetBlobsResponse) error
+	grpc.ServerStream
+}
+
+type blobServiceGetBlobsServer struct {
+	grpc.ServerStream
+}
+
+func (x *blobServiceGetBlobsServer) Send(m *GetBlobsResponse) error {
+	return x.ServerStream.SendMsg(m)
+}
+
 var _BlobService_serviceDesc = grpc.ServiceDesc{
 	ServiceName: "gitaly.BlobService",
 	HandlerType: (*BlobServiceServer)(nil),
@@ -340,6 +481,11 @@ var _BlobService_serviceDesc = grpc.ServiceDesc{
 			Handler:       _BlobService_GetBlob_Handler,
 			ServerStreams: true,
 		},
+		{
+			StreamName:    "GetBlobs",
+			Handler:       _BlobService_GetBlobs_Handler,
+			ServerStreams: true,
+		},
 	},
 	Metadata: "blob.proto",
 }
@@ -347,19 +493,22 @@ var _BlobService_serviceDesc = grpc.ServiceDesc{
 func init() { proto.RegisterFile("blob.proto", fileDescriptor0) }
 
 var fileDescriptor0 = []byte{
-	// 217 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x90, 0x31, 0x4b, 0xc7, 0x30,
-	0x10, 0xc5, 0x8d, 0xd1, 0xbf, 0x78, 0x2d, 0x2a, 0x87, 0x68, 0xe9, 0x54, 0x3a, 0x75, 0x2a, 0x52,
-	0x77, 0x07, 0x17, 0x07, 0x71, 0x89, 0x9f, 0x20, 0xb1, 0x87, 0x06, 0xa2, 0x57, 0x93, 0x28, 0xd4,
-	0x4f, 0x2f, 0x4d, 0x6c, 0x51, 0xdc, 0x5e, 0x5e, 0x92, 0xf7, 0x7b, 0x77, 0x00, 0xc6, 0xb1, 0xe9,
-	0x27, 0xcf, 0x91, 0x71, 0xf7, 0x6c, 0xa3, 0x76, 0x73, 0x5d, 0x86, 0x17, 0xed, 0x69, 0xcc, 0x6e,
-	0xeb, 0xe0, 0xe4, 0x8e, 0xe2, 0xad, 0x63, 0xa3, 0xe8, 0xfd, 0x83, 0x42, 0xc4, 0x01, 0xc0, 0xd3,
-	0xc4, 0xc1, 0x46, 0xf6, 0x73, 0x25, 0x1a, 0xd1, 0x15, 0x03, 0xf6, 0xf9, 0x73, 0xaf, 0xb6, 0x1b,
-	0xf5, 0xeb, 0x15, 0x9e, 0x81, 0x64, 0x3b, 0x56, 0xfb, 0x8d, 0xe8, 0x8e, 0xd5, 0x22, 0xf1, 0x1c,
-	0x0e, 0x9d, 0x7d, 0xb5, 0xb1, 0x92, 0x8d, 0xe8, 0xa4, 0xca, 0x87, 0xf6, 0x1e, 0x4e, 0x37, 0x5a,
-	0x98, 0xf8, 0x2d, 0x10, 0x22, 0x1c, 0x04, 0xfb, 0x45, 0x09, 0x24, 0x55, 0xd2, 0x8b, 0x37, 0xea,
-	0xa8, 0x53, 0x5e, 0xa9, 0x92, 0x5e, 0x11, 0x72, 0x43, 0x0c, 0x0f, 0x50, 0x2c, 0x49, 0x8f, 0xe4,
-	0x3f, 0xed, 0x13, 0xe1, 0x0d, 0x1c, 0xfd, 0x64, 0xe3, 0xc5, 0x5a, 0xf7, 0xef, 0x68, 0xf5, 0xe5,
-	0x3f, 0x3f, 0x97, 0x68, 0xf7, 0xae, 0x84, 0xd9, 0xa5, 0x85, 0x5c, 0x7f, 0x07, 0x00, 0x00, 0xff,
-	0xff, 0xab, 0x77, 0x1a, 0x6d, 0x34, 0x01, 0x00, 0x00,
+	// 266 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x92, 0x31, 0x4f, 0xc3, 0x30,
+	0x10, 0x85, 0x71, 0x5d, 0x0a, 0xbd, 0x56, 0x50, 0x9d, 0x10, 0x58, 0x99, 0xa2, 0x4c, 0x99, 0x22,
+	0x14, 0x76, 0x24, 0x58, 0x18, 0x60, 0x32, 0xbf, 0x20, 0x21, 0x27, 0xb0, 0x64, 0xb8, 0x60, 0x1b,
+	0xa4, 0xf2, 0x2b, 0xf8, 0xc9, 0x28, 0x0e, 0x49, 0x81, 0x8a, 0xa9, 0xdb, 0xcb, 0xbb, 0xcb, 0x7b,
+	0x9f, 0x6c, 0x03, 0xd4, 0x96, 0xeb, 0xa2, 0x75, 0x1c, 0x18, 0x67, 0x8f, 0x26, 0x54, 0x76, 0x9d,
+	0x2c, 0xfd, 0x53, 0xe5, 0xa8, 0xe9, 0xdd, 0xcc, 0xc2, 0xd1, 0x0d, 0x85, 0x6b, 0xcb, 0xb5, 0xa6,
+	0xd7, 0x37, 0xf2, 0x01, 0x4b, 0x00, 0x47, 0x2d, 0x7b, 0x13, 0xd8, 0xad, 0x95, 0x48, 0x45, 0xbe,
+	0x28, 0xb1, 0xe8, 0x7f, 0x2e, 0xf4, 0x38, 0xd1, 0x3f, 0xb6, 0x70, 0x05, 0x92, 0x4d, 0xa3, 0x26,
+	0xa9, 0xc8, 0xe7, 0xba, 0x93, 0x78, 0x02, 0xfb, 0xd6, 0x3c, 0x9b, 0xa0, 0x64, 0x2a, 0x72, 0xa9,
+	0xfb, 0x8f, 0xec, 0x16, 0x8e, 0xc7, 0x36, 0xdf, 0xf2, 0x8b, 0x27, 0x44, 0x98, 0x7a, 0xf3, 0x41,
+	0xb1, 0x48, 0xea, 0xa8, 0x3b, 0xaf, 0xa9, 0x42, 0x15, 0xf3, 0x96, 0x3a, 0xea, 0xa1, 0x42, 0x8e,
+	0x15, 0x19, 0x8f, 0x61, 0x7e, 0x17, 0x76, 0x84, 0x29, 0x9b, 0xc6, 0xab, 0x49, 0x2a, 0xf3, 0xb9,
+	0x8e, 0xfa, 0x1f, 0xfa, 0x3b, 0x58, 0x6d, 0x0a, 0x77, 0xc5, 0x2f, 0x3f, 0x05, 0x2c, 0xba, 0xac,
+	0x7b, 0x72, 0xef, 0xe6, 0x81, 0xf0, 0x12, 0x0e, 0xbe, 0xd3, 0xf1, 0x74, 0x40, 0xfe, 0x7d, 0x35,
+	0xc9, 0xd9, 0x96, 0xdf, 0x53, 0x64, 0x7b, 0xe7, 0x02, 0xaf, 0xe0, 0x70, 0xa0, 0xc3, 0xbf, 0x8b,
+	0xc3, 0x01, 0x25, 0x6a, 0x7b, 0xb0, 0x89, 0xa8, 0x67, 0xf1, 0x4d, 0x5c, 0x7c, 0x05, 0x00, 0x00,
+	0xff, 0xff, 0x99, 0x07, 0x5e, 0x8d, 0x37, 0x02, 0x00, 0x00,
 }
diff --git a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/operations.pb.go b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/operations.pb.go
index 0e0559d02..43af81f54 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
@@ -324,7 +324,7 @@ type UserMergeBranchResponse struct {
 	CommitId string `protobuf:"bytes,1,opt,name=commit_id,json=commitId" json:"commit_id,omitempty"`
 	// Second message
 	// If set, the merge has been applied to the branch.
-	Applied bool `protobuf:"varint,2,opt,name=applied" json:"applied,omitempty"`
+	BranchUpdate *OperationBranchUpdate `protobuf:"bytes,3,opt,name=branch_update,json=branchUpdate" json:"branch_update,omitempty"`
 }
 
 func (m *UserMergeBranchResponse) Reset()                    { *m = UserMergeBranchResponse{} }
@@ -339,9 +339,44 @@ func (m *UserMergeBranchResponse) GetCommitId() string {
 	return ""
 }
 
-func (m *UserMergeBranchResponse) GetApplied() bool {
+func (m *UserMergeBranchResponse) GetBranchUpdate() *OperationBranchUpdate {
 	if m != nil {
-		return m.Applied
+		return m.BranchUpdate
+	}
+	return nil
+}
+
+type OperationBranchUpdate struct {
+	// If this string is non-empty the branch has been updated.
+	CommitId string `protobuf:"bytes,1,opt,name=commit_id,json=commitId" json:"commit_id,omitempty"`
+	// Used for cache invalidation in GitLab
+	RepoCreated bool `protobuf:"varint,2,opt,name=repo_created,json=repoCreated" json:"repo_created,omitempty"`
+	// Used for cache invalidation in GitLab
+	BranchCreated bool `protobuf:"varint,3,opt,name=branch_created,json=branchCreated" json:"branch_created,omitempty"`
+}
+
+func (m *OperationBranchUpdate) Reset()                    { *m = OperationBranchUpdate{} }
+func (m *OperationBranchUpdate) String() string            { return proto.CompactTextString(m) }
+func (*OperationBranchUpdate) ProtoMessage()               {}
+func (*OperationBranchUpdate) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{10} }
+
+func (m *OperationBranchUpdate) GetCommitId() string {
+	if m != nil {
+		return m.CommitId
+	}
+	return ""
+}
+
+func (m *OperationBranchUpdate) GetRepoCreated() bool {
+	if m != nil {
+		return m.RepoCreated
+	}
+	return false
+}
+
+func (m *OperationBranchUpdate) GetBranchCreated() bool {
+	if m != nil {
+		return m.BranchCreated
 	}
 	return false
 }
@@ -357,6 +392,7 @@ func init() {
 	proto.RegisterType((*UserCreateTagResponse)(nil), "gitaly.UserCreateTagResponse")
 	proto.RegisterType((*UserMergeBranchRequest)(nil), "gitaly.UserMergeBranchRequest")
 	proto.RegisterType((*UserMergeBranchResponse)(nil), "gitaly.UserMergeBranchResponse")
+	proto.RegisterType((*OperationBranchUpdate)(nil), "gitaly.OperationBranchUpdate")
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -599,42 +635,45 @@ var _OperationService_serviceDesc = grpc.ServiceDesc{
 func init() { proto.RegisterFile("operations.proto", fileDescriptor6) }
 
 var fileDescriptor6 = []byte{
-	// 577 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x55, 0xc1, 0x6e, 0xd3, 0x4c,
-	0x10, 0x8e, 0x9b, 0x36, 0x49, 0x27, 0xf9, 0x9b, 0xfc, 0xab, 0x52, 0x4c, 0xa0, 0x24, 0xf2, 0x01,
-	0x22, 0x0e, 0x11, 0x0a, 0x6f, 0x40, 0x01, 0x89, 0x03, 0xa5, 0x32, 0x20, 0xb8, 0x59, 0xdb, 0x64,
-	0xe4, 0xae, 0x94, 0x78, 0xcd, 0xec, 0x36, 0x22, 0xbc, 0x00, 0x57, 0x5e, 0x85, 0x17, 0xe0, 0x01,
-	0xb8, 0xf2, 0x42, 0xc8, 0xde, 0x75, 0x6b, 0x3b, 0xb6, 0x84, 0x00, 0x09, 0x8e, 0xfb, 0xed, 0xe6,
-	0x9b, 0xef, 0xfb, 0x32, 0x33, 0x86, 0x81, 0x8c, 0x91, 0xb8, 0x16, 0x32, 0x52, 0xd3, 0x98, 0xa4,
-	0x96, 0xac, 0x15, 0x0a, 0xcd, 0x97, 0x9b, 0x61, 0x4f, 0x5d, 0x70, 0xc2, 0x85, 0x41, 0xbd, 0x2f,
-	0x0e, 0xdc, 0x7c, 0xa3, 0x90, 0x4e, 0x08, 0xb9, 0xc6, 0xc7, 0xc4, 0xa3, 0xf9, 0x85, 0x8f, 0xef,
-	0x2f, 0x51, 0x69, 0x36, 0x03, 0x20, 0x8c, 0xa5, 0x12, 0x5a, 0xd2, 0xc6, 0x75, 0xc6, 0xce, 0xa4,
-	0x3b, 0x63, 0x53, 0x43, 0x33, 0xf5, 0xaf, 0x6e, 0xfc, 0xdc, 0x2b, 0x36, 0x82, 0xee, 0x79, 0x4a,
-	0x12, 0x44, 0x7c, 0x85, 0xee, 0xce, 0xd8, 0x99, 0xf4, 0x7c, 0x30, 0xd0, 0x29, 0x5f, 0x21, 0x1b,
-	0xc3, 0xee, 0xa5, 0x42, 0x72, 0x9b, 0x29, 0x5d, 0x2f, 0xa3, 0x4b, 0x34, 0xf8, 0xe9, 0x4d, 0x42,
-	0xa1, 0x34, 0x27, 0x1d, 0xc4, 0x52, 0x44, 0xda, 0xdd, 0x35, 0x14, 0x29, 0x74, 0x96, 0x20, 0x5e,
-	0x04, 0xee, 0xb6, 0x64, 0x15, 0xcb, 0x48, 0x21, 0xbb, 0x07, 0x2d, 0x53, 0xcc, 0xea, 0x3d, 0xc8,
-	0x0a, 0xd8, 0x77, 0xf6, 0x96, 0x3d, 0x80, 0xff, 0x63, 0xc2, 0x80, 0x70, 0x8e, 0x62, 0x8d, 0x01,
-	0x12, 0x49, 0x4a, 0xd5, 0xee, 0xfb, 0xfd, 0x98, 0xd0, 0x37, 0xf8, 0xd3, 0x04, 0xf6, 0x3e, 0xdb,
-	0x8c, 0x9e, 0xe0, 0x12, 0xff, 0x8d, 0x8c, 0xbc, 0x67, 0x26, 0x82, 0xa2, 0x22, 0x1b, 0x41, 0xa5,
-	0x35, 0xa7, 0xda, 0xda, 0x27, 0x07, 0x0e, 0xaf, 0x89, 0x5e, 0xf3, 0xf0, 0x77, 0x7c, 0xdd, 0x82,
-	0x8e, 0xe6, 0x61, 0xde, 0x54, 0x5b, 0xf3, 0xf0, 0x27, 0x1d, 0x9d, 0xc0, 0x8d, 0x92, 0x90, 0x5f,
-	0xb0, 0xf3, 0xcd, 0xda, 0x31, 0xad, 0xf1, 0x17, 0xed, 0xb0, 0xfb, 0xd0, 0xd7, 0x9c, 0x42, 0xd4,
-	0x01, 0xe1, 0x5a, 0x28, 0x21, 0x23, 0xdb, 0xc8, 0x07, 0x06, 0xf6, 0x2d, 0xca, 0x5c, 0x68, 0xaf,
-	0x50, 0x29, 0x1e, 0xa2, 0xbb, 0x67, 0x8a, 0xd8, 0xa3, 0xf7, 0xd1, 0x24, 0x92, 0xf3, 0x62, 0x13,
-	0x39, 0x86, 0xa6, 0xe6, 0xa1, 0x75, 0xd1, 0xcd, 0x8a, 0x27, 0x2f, 0x12, 0x9c, 0x1d, 0x41, 0x0b,
-	0x3f, 0x08, 0xa5, 0x55, 0xaa, 0xba, 0xe3, 0xdb, 0x53, 0x75, 0x90, 0xcd, 0xea, 0x20, 0xbf, 0x3b,
-	0x70, 0x94, 0x14, 0x7f, 0x81, 0x14, 0xfe, 0x81, 0x8e, 0xcf, 0xf2, 0xda, 0xa9, 0xcd, 0xeb, 0x36,
-	0xec, 0xcf, 0xe5, 0x6a, 0x25, 0x74, 0x20, 0x16, 0x56, 0x54, 0xc7, 0x00, 0xcf, 0x17, 0x89, 0x23,
-	0x3b, 0xd4, 0x26, 0xc3, 0x6c, 0x88, 0x6b, 0xb3, 0x63, 0x87, 0xb0, 0xc7, 0xe3, 0x78, 0xb9, 0x71,
-	0x5b, 0x69, 0x04, 0xe6, 0xe0, 0x9d, 0x99, 0x39, 0x2e, 0x98, 0xb2, 0x99, 0x16, 0xea, 0x3b, 0xa5,
-	0xfa, 0x2e, 0xb4, 0x13, 0x02, 0x81, 0x0b, 0x1b, 0x69, 0x76, 0x9c, 0x7d, 0x6d, 0xc2, 0xe0, 0x65,
-	0xb6, 0x69, 0x5f, 0x21, 0xad, 0xc5, 0x1c, 0xd9, 0x5b, 0x18, 0x94, 0xf7, 0x13, 0x1b, 0xe5, 0x3d,
-	0x57, 0x2c, 0xdb, 0xe1, 0xb8, 0xfe, 0x81, 0x91, 0xe8, 0x35, 0x32, 0xe2, 0xfc, 0xd4, 0x17, 0x89,
-	0x2b, 0x36, 0x54, 0x91, 0xb8, 0x6a, 0x61, 0x78, 0x0d, 0x76, 0x0a, 0xff, 0x15, 0x5a, 0x8d, 0xdd,
-	0xd9, 0x56, 0x73, 0x3d, 0x4d, 0xc3, 0xe3, 0x9a, 0xdb, 0x32, 0xdf, 0xd5, 0x30, 0x17, 0xf9, 0xca,
-	0xcb, 0xa6, 0xc8, 0xb7, 0xb5, 0x01, 0xbc, 0x06, 0x7b, 0x07, 0xfd, 0xd2, 0x1f, 0xc7, 0xee, 0xe6,
-	0x7f, 0xb3, 0xdd, 0xa6, 0xc3, 0x51, 0xed, 0x7d, 0xc6, 0x3a, 0x71, 0x1e, 0x3a, 0xe7, 0xad, 0xf4,
-	0x33, 0xf8, 0xe8, 0x47, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc4, 0xb7, 0x3c, 0x08, 0x30, 0x07, 0x00,
-	0x00,
+	// 637 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x55, 0xc1, 0x6e, 0xd3, 0x40,
+	0x10, 0xad, 0xe3, 0x34, 0x4d, 0x27, 0x69, 0x12, 0x56, 0x6d, 0x31, 0x81, 0x90, 0x60, 0x09, 0x88,
+	0x38, 0x44, 0x28, 0xfc, 0x41, 0x0b, 0x48, 0x20, 0x51, 0x90, 0xa1, 0x82, 0x9b, 0xb5, 0x89, 0x47,
+	0xae, 0xa5, 0xc4, 0x36, 0xbb, 0x9b, 0x88, 0x70, 0x40, 0xdc, 0xb8, 0xf2, 0x2b, 0xfc, 0x00, 0x1f,
+	0xc0, 0x95, 0x1f, 0x42, 0xde, 0x5d, 0xa7, 0xb6, 0xe3, 0x20, 0x04, 0x48, 0x70, 0xdc, 0xd9, 0xf1,
+	0x9b, 0xf7, 0xde, 0xce, 0x8c, 0xa1, 0x13, 0xc5, 0xc8, 0xa8, 0x08, 0xa2, 0x90, 0x8f, 0x62, 0x16,
+	0x89, 0x88, 0xd4, 0xfc, 0x40, 0xd0, 0xd9, 0xaa, 0xdb, 0xe4, 0x17, 0x94, 0xa1, 0xa7, 0xa2, 0xf6,
+	0x17, 0x03, 0xae, 0x9e, 0x73, 0x64, 0xa7, 0x0c, 0xa9, 0xc0, 0x13, 0x46, 0xc3, 0xe9, 0x85, 0x83,
+	0x6f, 0x17, 0xc8, 0x05, 0x19, 0x03, 0x30, 0x8c, 0x23, 0x1e, 0x88, 0x88, 0xad, 0x2c, 0x63, 0x60,
+	0x0c, 0x1b, 0x63, 0x32, 0x52, 0x30, 0x23, 0x67, 0x7d, 0xe3, 0x64, 0xb2, 0x48, 0x1f, 0x1a, 0x13,
+	0x09, 0xe2, 0x86, 0x74, 0x8e, 0x56, 0x65, 0x60, 0x0c, 0x9b, 0x0e, 0xa8, 0xd0, 0x19, 0x9d, 0x23,
+	0x19, 0x40, 0x75, 0xc1, 0x91, 0x59, 0xa6, 0x84, 0x6b, 0xa6, 0x70, 0x09, 0x07, 0x47, 0xde, 0x24,
+	0x10, 0x5c, 0x50, 0x26, 0xdc, 0x38, 0x0a, 0x42, 0x61, 0x55, 0x15, 0x84, 0x0c, 0xbd, 0x48, 0x22,
+	0x76, 0x08, 0xd6, 0x26, 0x65, 0x1e, 0x47, 0x21, 0x47, 0x72, 0x07, 0x6a, 0xaa, 0x98, 0xe6, 0xdb,
+	0x4a, 0x0b, 0xe8, 0x3c, 0x7d, 0x4b, 0xee, 0xc1, 0x95, 0x98, 0xa1, 0xcb, 0x70, 0x8a, 0xc1, 0x12,
+	0x5d, 0x64, 0x2c, 0x62, 0x92, 0xed, 0xbe, 0xd3, 0x8e, 0x19, 0x3a, 0x2a, 0xfe, 0x28, 0x09, 0xdb,
+	0x9f, 0xb5, 0x47, 0x0f, 0x71, 0x86, 0xff, 0x87, 0x47, 0xf6, 0x63, 0x65, 0x41, 0x9e, 0x91, 0xb6,
+	0xa0, 0x54, 0x9a, 0x51, 0x2e, 0xed, 0x93, 0x01, 0x87, 0x97, 0x40, 0xaf, 0xa8, 0xff, 0x27, 0xba,
+	0xae, 0x41, 0x5d, 0x50, 0x3f, 0x2b, 0x6a, 0x4f, 0x50, 0xff, 0x17, 0x15, 0x9d, 0xc2, 0x51, 0x81,
+	0xc8, 0x6f, 0xc8, 0xf9, 0xa6, 0xe5, 0xa8, 0xd6, 0xf8, 0x87, 0x72, 0xc8, 0x5d, 0x68, 0x0b, 0xca,
+	0x7c, 0x14, 0x2e, 0xc3, 0x65, 0xc0, 0x83, 0x28, 0xd4, 0x8d, 0xdc, 0x52, 0x61, 0x47, 0x47, 0x89,
+	0x05, 0x7b, 0x73, 0xe4, 0x9c, 0xfa, 0x68, 0xed, 0xaa, 0x22, 0xfa, 0x68, 0xbf, 0x57, 0x8e, 0x64,
+	0xb4, 0x68, 0x47, 0x7a, 0x60, 0x0a, 0xea, 0x6b, 0x15, 0x8d, 0xb4, 0x78, 0x92, 0x91, 0xc4, 0xc9,
+	0x31, 0xd4, 0xf0, 0x5d, 0xc0, 0x05, 0x97, 0xac, 0xeb, 0x8e, 0x3e, 0x95, 0x1b, 0x69, 0x96, 0x1b,
+	0xf9, 0xdd, 0x80, 0xe3, 0xa4, 0xf8, 0x33, 0x64, 0xfe, 0x5f, 0xe8, 0xf8, 0xd4, 0xaf, 0xca, 0x56,
+	0xbf, 0xae, 0xc3, 0xfe, 0x34, 0x9a, 0xcf, 0x03, 0xe1, 0x06, 0x9e, 0x26, 0x55, 0x57, 0x81, 0x27,
+	0x5e, 0xa2, 0x48, 0x0f, 0xb5, 0xf2, 0x30, 0x1d, 0xe2, 0xad, 0xde, 0x91, 0x43, 0xd8, 0xa5, 0x71,
+	0x3c, 0x5b, 0x59, 0x35, 0x69, 0x81, 0x3a, 0xd8, 0x1f, 0xf5, 0x20, 0xe7, 0x54, 0x69, 0x53, 0x73,
+	0x04, 0x8c, 0x02, 0x81, 0x13, 0x38, 0xd0, 0x13, 0xbb, 0x88, 0x3d, 0x2a, 0x50, 0x3f, 0x7c, 0x2f,
+	0x15, 0xf2, 0x3c, 0x5d, 0xb6, 0x0a, 0xf4, 0x5c, 0x26, 0x39, 0xcd, 0x49, 0xe6, 0xf4, 0xb4, 0x5a,
+	0xaf, 0x74, 0x4c, 0xfb, 0x03, 0x1c, 0x95, 0x26, 0xff, 0xbc, 0xfe, 0x2d, 0x68, 0x26, 0x6e, 0xba,
+	0x53, 0xd9, 0x0b, 0x9e, 0x7e, 0xd8, 0x46, 0x12, 0x53, 0xed, 0xe1, 0x91, 0xdb, 0xd0, 0xd2, 0x14,
+	0xd3, 0x24, 0x53, 0x26, 0x69, 0xe2, 0x3a, 0x6d, 0xfc, 0xd5, 0x84, 0xce, 0x9a, 0xc0, 0x4b, 0x64,
+	0xcb, 0x60, 0x8a, 0xe4, 0x35, 0x74, 0x8a, 0x0b, 0x95, 0xf4, 0xb3, 0x8f, 0x54, 0xf2, 0x77, 0xe8,
+	0x0e, 0xb6, 0x27, 0x28, 0x4b, 0xed, 0x9d, 0x14, 0x38, 0xbb, 0xa6, 0xf2, 0xc0, 0x25, 0x2b, 0x35,
+	0x0f, 0x5c, 0xb6, 0xe1, 0xec, 0x1d, 0x72, 0x06, 0x07, 0xb9, 0xd9, 0x20, 0x37, 0x36, 0xd9, 0x5c,
+	0x8e, 0x7f, 0xb7, 0xb7, 0xe5, 0xb6, 0x88, 0xb7, 0xde, 0x3e, 0x79, 0xbc, 0xe2, 0x76, 0xcc, 0xe3,
+	0x6d, 0xac, 0x2c, 0x7b, 0x87, 0xbc, 0x81, 0x76, 0xa1, 0xd1, 0xc8, 0xcd, 0xec, 0x37, 0x9b, 0x73,
+	0xd5, 0xed, 0x6f, 0xbd, 0x4f, 0x51, 0x87, 0xc6, 0x7d, 0x63, 0x52, 0x93, 0xff, 0xed, 0x07, 0x3f,
+	0x02, 0x00, 0x00, 0xff, 0xff, 0xd1, 0x35, 0x6e, 0x0e, 0xe1, 0x07, 0x00, 0x00,
 }
diff --git a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/wiki.pb.go b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/wiki.pb.go
new file mode 100644
index 000000000..91b8efec3
--- /dev/null
+++ b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/wiki.pb.go
@@ -0,0 +1,210 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: wiki.proto
+
+package gitaly
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+
+import (
+	context "golang.org/x/net/context"
+	grpc "google.golang.org/grpc"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+type WikiPageVersion struct {
+	Commit *GitCommit `protobuf:"bytes,1,opt,name=commit" json:"commit,omitempty"`
+	Format string     `protobuf:"bytes,2,opt,name=format" json:"format,omitempty"`
+}
+
+func (m *WikiPageVersion) Reset()                    { *m = WikiPageVersion{} }
+func (m *WikiPageVersion) String() string            { return proto.CompactTextString(m) }
+func (*WikiPageVersion) ProtoMessage()               {}
+func (*WikiPageVersion) Descriptor() ([]byte, []int) { return fileDescriptor12, []int{0} }
+
+func (m *WikiPageVersion) GetCommit() *GitCommit {
+	if m != nil {
+		return m.Commit
+	}
+	return nil
+}
+
+func (m *WikiPageVersion) GetFormat() string {
+	if m != nil {
+		return m.Format
+	}
+	return ""
+}
+
+type WikiGetPageVersionsRequest struct {
+	Repository *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"`
+	PagePath   []byte      `protobuf:"bytes,2,opt,name=page_path,json=pagePath,proto3" json:"page_path,omitempty"`
+}
+
+func (m *WikiGetPageVersionsRequest) Reset()                    { *m = WikiGetPageVersionsRequest{} }
+func (m *WikiGetPageVersionsRequest) String() string            { return proto.CompactTextString(m) }
+func (*WikiGetPageVersionsRequest) ProtoMessage()               {}
+func (*WikiGetPageVersionsRequest) Descriptor() ([]byte, []int) { return fileDescriptor12, []int{1} }
+
+func (m *WikiGetPageVersionsRequest) GetRepository() *Repository {
+	if m != nil {
+		return m.Repository
+	}
+	return nil
+}
+
+func (m *WikiGetPageVersionsRequest) GetPagePath() []byte {
+	if m != nil {
+		return m.PagePath
+	}
+	return nil
+}
+
+type WikiGetPageVersionsResponse struct {
+	Versions []*WikiPageVersion `protobuf:"bytes,1,rep,name=versions" json:"versions,omitempty"`
+}
+
+func (m *WikiGetPageVersionsResponse) Reset()                    { *m = WikiGetPageVersionsResponse{} }
+func (m *WikiGetPageVersionsResponse) String() string            { return proto.CompactTextString(m) }
+func (*WikiGetPageVersionsResponse) ProtoMessage()               {}
+func (*WikiGetPageVersionsResponse) Descriptor() ([]byte, []int) { return fileDescriptor12, []int{2} }
+
+func (m *WikiGetPageVersionsResponse) GetVersions() []*WikiPageVersion {
+	if m != nil {
+		return m.Versions
+	}
+	return nil
+}
+
+func init() {
+	proto.RegisterType((*WikiPageVersion)(nil), "gitaly.WikiPageVersion")
+	proto.RegisterType((*WikiGetPageVersionsRequest)(nil), "gitaly.WikiGetPageVersionsRequest")
+	proto.RegisterType((*WikiGetPageVersionsResponse)(nil), "gitaly.WikiGetPageVersionsResponse")
+}
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ context.Context
+var _ grpc.ClientConn
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+const _ = grpc.SupportPackageIsVersion4
+
+// Client API for WikiService service
+
+type WikiServiceClient interface {
+	WikiGetPageVersions(ctx context.Context, in *WikiGetPageVersionsRequest, opts ...grpc.CallOption) (WikiService_WikiGetPageVersionsClient, error)
+}
+
+type wikiServiceClient struct {
+	cc *grpc.ClientConn
+}
+
+func NewWikiServiceClient(cc *grpc.ClientConn) WikiServiceClient {
+	return &wikiServiceClient{cc}
+}
+
+func (c *wikiServiceClient) WikiGetPageVersions(ctx context.Context, in *WikiGetPageVersionsRequest, opts ...grpc.CallOption) (WikiService_WikiGetPageVersionsClient, error) {
+	stream, err := grpc.NewClientStream(ctx, &_WikiService_serviceDesc.Streams[0], c.cc, "/gitaly.WikiService/WikiGetPageVersions", opts...)
+	if err != nil {
+		return nil, err
+	}
+	x := &wikiServiceWikiGetPageVersionsClient{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 WikiService_WikiGetPageVersionsClient interface {
+	Recv() (*WikiGetPageVersionsResponse, error)
+	grpc.ClientStream
+}
+
+type wikiServiceWikiGetPageVersionsClient struct {
+	grpc.ClientStream
+}
+
+func (x *wikiServiceWikiGetPageVersionsClient) Recv() (*WikiGetPageVersionsResponse, error) {
+	m := new(WikiGetPageVersionsResponse)
+	if err := x.ClientStream.RecvMsg(m); err != nil {
+		return nil, err
+	}
+	return m, nil
+}
+
+// Server API for WikiService service
+
+type WikiServiceServer interface {
+	WikiGetPageVersions(*WikiGetPageVersionsRequest, WikiService_WikiGetPageVersionsServer) error
+}
+
+func RegisterWikiServiceServer(s *grpc.Server, srv WikiServiceServer) {
+	s.RegisterService(&_WikiService_serviceDesc, srv)
+}
+
+func _WikiService_WikiGetPageVersions_Handler(srv interface{}, stream grpc.ServerStream) error {
+	m := new(WikiGetPageVersionsRequest)
+	if err := stream.RecvMsg(m); err != nil {
+		return err
+	}
+	return srv.(WikiServiceServer).WikiGetPageVersions(m, &wikiServiceWikiGetPageVersionsServer{stream})
+}
+
+type WikiService_WikiGetPageVersionsServer interface {
+	Send(*WikiGetPageVersionsResponse) error
+	grpc.ServerStream
+}
+
+type wikiServiceWikiGetPageVersionsServer struct {
+	grpc.ServerStream
+}
+
+func (x *wikiServiceWikiGetPageVersionsServer) Send(m *WikiGetPageVersionsResponse) error {
+	return x.ServerStream.SendMsg(m)
+}
+
+var _WikiService_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "gitaly.WikiService",
+	HandlerType: (*WikiServiceServer)(nil),
+	Methods:     []grpc.MethodDesc{},
+	Streams: []grpc.StreamDesc{
+		{
+			StreamName:    "WikiGetPageVersions",
+			Handler:       _WikiService_WikiGetPageVersions_Handler,
+			ServerStreams: true,
+		},
+	},
+	Metadata: "wiki.proto",
+}
+
+func init() { proto.RegisterFile("wiki.proto", fileDescriptor12) }
+
+var fileDescriptor12 = []byte{
+	// 258 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0xcf, 0x4a, 0xf3, 0x40,
+	0x14, 0xc5, 0xbf, 0x7c, 0x42, 0x68, 0x6f, 0x0a, 0xe2, 0x08, 0x1a, 0xd2, 0x4d, 0x18, 0x37, 0x71,
+	0x13, 0x24, 0x7d, 0x04, 0x17, 0xdd, 0x96, 0x51, 0x74, 0x29, 0xd3, 0x7a, 0x4d, 0x2e, 0x35, 0x9d,
+	0xe9, 0xcc, 0xb5, 0xd2, 0xb7, 0x97, 0xfc, 0x69, 0x09, 0x12, 0x5c, 0xce, 0x39, 0x67, 0xce, 0x6f,
+	0x0e, 0x03, 0xf0, 0x4d, 0x5b, 0xca, 0xad, 0x33, 0x6c, 0x44, 0x58, 0x12, 0xeb, 0xcf, 0x63, 0x32,
+	0xf3, 0x95, 0x76, 0xf8, 0xde, 0xa9, 0xf2, 0x19, 0x2e, 0x5f, 0x69, 0x4b, 0x2b, 0x5d, 0xe2, 0x0b,
+	0x3a, 0x4f, 0x66, 0x27, 0xee, 0x21, 0xdc, 0x98, 0xba, 0x26, 0x8e, 0x83, 0x34, 0xc8, 0xa2, 0xe2,
+	0x2a, 0xef, 0x6e, 0xe6, 0x4b, 0xe2, 0xc7, 0xd6, 0x50, 0x7d, 0x40, 0xdc, 0x40, 0xf8, 0x61, 0x5c,
+	0xad, 0x39, 0xfe, 0x9f, 0x06, 0xd9, 0x54, 0xf5, 0x27, 0x59, 0x43, 0xd2, 0xb4, 0x2e, 0x91, 0x07,
+	0xc5, 0x5e, 0xe1, 0xfe, 0x0b, 0x3d, 0x8b, 0x02, 0xc0, 0xa1, 0x35, 0x9e, 0xd8, 0xb8, 0x63, 0x0f,
+	0x11, 0x27, 0x88, 0x3a, 0x3b, 0x6a, 0x90, 0x12, 0x73, 0x98, 0x5a, 0x5d, 0xe2, 0x9b, 0xd5, 0x5c,
+	0xb5, 0xb0, 0x99, 0x9a, 0x34, 0xc2, 0x4a, 0x73, 0x25, 0x15, 0xcc, 0x47, 0x71, 0xde, 0x9a, 0x9d,
+	0x47, 0xb1, 0x80, 0xc9, 0xa1, 0xd7, 0xe2, 0x20, 0xbd, 0xc8, 0xa2, 0xe2, 0xf6, 0x44, 0xfb, 0xb5,
+	0x5d, 0x9d, 0x83, 0xc5, 0x1e, 0xa2, 0xc6, 0x7c, 0x42, 0x77, 0xa0, 0x0d, 0x8a, 0x35, 0x5c, 0x8f,
+	0x20, 0x84, 0x1c, 0x16, 0x8d, 0xcf, 0x4d, 0xee, 0xfe, 0xcc, 0x74, 0x6f, 0x94, 0xff, 0x1e, 0x82,
+	0x75, 0xd8, 0x7e, 0xc9, 0xe2, 0x27, 0x00, 0x00, 0xff, 0xff, 0x7d, 0x27, 0x74, 0x80, 0xb6, 0x01,
+	0x00, 0x00,
+}
diff --git a/vendor/vendor.json b/vendor/vendor.json
index 9f27d9d8d..fe9f39ea5 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -201,12 +201,12 @@
 			"revisionTime": "2017-01-30T11:31:45Z"
 		},
 		{
-			"checksumSHA1": "4HGUU//aYvIK+6Eyu/ve8FOUB4Q=",
+			"checksumSHA1": "9CXsmIoIdDDr4AQ++8DyaUuMrkU=",
 			"path": "gitlab.com/gitlab-org/gitaly-proto/go",
-			"revision": "36903e93ee07e04871ce6f7e980a25c92e117abf",
-			"revisionTime": "2017-10-09T15:53:42Z",
-			"version": "v0.41.0",
-			"versionExact": "v0.41.0"
+			"revision": "a918edda7c98362f4fa5a83701dce6be72f148a0",
+			"revisionTime": "2017-10-11T12:19:42Z",
+			"version": "v0.42.0",
+			"versionExact": "v0.42.0"
 		},
 		{
 			"checksumSHA1": "nqWNlnMmVpt628zzvyo6Yv2CX5Q=",