Incorporate ConflictsService

23 files changed, 957 insertions, 232 deletions

diff --git a/internal/rubyserver/rubyserver.go b/internal/rubyserver/rubyserver.go
index 821529efa..4970185b3 100644
--- a/internal/rubyserver/rubyserver.go
+++ b/internal/rubyserver/rubyserver.go
@@ -178,6 +178,14 @@ func (s *Server) WikiServiceClient(ctx context.Context) (pb.WikiServiceClient, e
 	return pb.NewWikiServiceClient(conn), err
 }
 
+// ConflictsServiceClient returns a ConflictsServiceClient instance that is
+// configured to connect to the running Ruby server. This assumes Start()
+// has been called already.
+func (s *Server) ConflictsServiceClient(ctx context.Context) (pb.ConflictsServiceClient, error) {
+	conn, err := s.getConnection(ctx)
+	return pb.NewConflictsServiceClient(conn), err
+}
+
 func (s *Server) getConnection(ctx context.Context) (*grpc.ClientConn, error) {
 	s.clientConnMu.RLock()
 	conn := s.clientConn
diff --git a/internal/service/conflicts/resolver.go b/internal/service/conflicts/resolver.go
new file mode 100644
index 000000000..926bf865c
--- /dev/null
+++ b/internal/service/conflicts/resolver.go
@@ -0,0 +1,14 @@
+package conflicts
+
+import (
+	pb "gitlab.com/gitlab-org/gitaly-proto/go"
+	"gitlab.com/gitlab-org/gitaly/internal/helper"
+)
+
+func (s *server) ListConflictFiles(in *pb.ListConflictFilesRequest, stream pb.ConflictsService_ListConflictFilesServer) error {
+	return helper.Unimplemented
+}
+
+func (s *server) ResolveConflicts(stream pb.ConflictsService_ResolveConflictsServer) error {
+	return helper.Unimplemented
+}
diff --git a/internal/service/conflicts/server.go b/internal/service/conflicts/server.go
new file mode 100644
index 000000000..bba67d6d9
--- /dev/null
+++ b/internal/service/conflicts/server.go
@@ -0,0 +1,15 @@
+package conflicts
+
+import (
+	pb "gitlab.com/gitlab-org/gitaly-proto/go"
+	"gitlab.com/gitlab-org/gitaly/internal/rubyserver"
+)
+
+type server struct {
+	*rubyserver.Server
+}
+
+// NewServer creates a new instance of a grpc ConflictsServer
+func NewServer(rs *rubyserver.Server) pb.ConflictsServiceServer {
+	return &server{rs}
+}
diff --git a/internal/service/register.go b/internal/service/register.go
index f849869c8..bccb45152 100644
--- a/internal/service/register.go
+++ b/internal/service/register.go
@@ -5,6 +5,7 @@ import (
 	"gitlab.com/gitlab-org/gitaly/internal/rubyserver"
 	"gitlab.com/gitlab-org/gitaly/internal/service/blob"
 	"gitlab.com/gitlab-org/gitaly/internal/service/commit"
+	"gitlab.com/gitlab-org/gitaly/internal/service/conflicts"
 	"gitlab.com/gitlab-org/gitaly/internal/service/diff"
 	"gitlab.com/gitlab-org/gitaly/internal/service/namespace"
 	"gitlab.com/gitlab-org/gitaly/internal/service/notifications"
@@ -34,6 +35,7 @@ func RegisterAll(grpcServer *grpc.Server, rubyServer *rubyserver.Server) {
 	pb.RegisterSSHServiceServer(grpcServer, ssh.NewServer())
 	pb.RegisterSmartHTTPServiceServer(grpcServer, smarthttp.NewServer())
 	pb.RegisterWikiServiceServer(grpcServer, wiki.NewServer(rubyServer))
+	pb.RegisterConflictsServiceServer(grpcServer, conflicts.NewServer(rubyServer))
 
 	healthpb.RegisterHealthServer(grpcServer, health.NewServer())
 }
diff --git a/ruby/Gemfile b/ruby/Gemfile
index 2aaf872d1..5bb3d94d1 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.59.0', require: 'gitaly'
+gem 'gitaly-proto', '~> 0.60.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 f4e4ab108..0318c2828 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.59.0)
+    gitaly-proto (0.60.0)
       google-protobuf (~> 3.1)
       grpc (~> 1.0)
     github-linguist (4.7.6)
@@ -119,7 +119,7 @@ PLATFORMS
 
 DEPENDENCIES
   activesupport
-  gitaly-proto (~> 0.59.0)
+  gitaly-proto (~> 0.60.0)
   github-linguist (~> 4.7.0)
   gitlab-styles (~> 2.0.0)
   gollum-lib (~> 4.2)
diff --git a/ruby/lib/gitaly_server.rb b/ruby/lib/gitaly_server.rb
index 5579024cc..7b109caa0 100644
--- a/ruby/lib/gitaly_server.rb
+++ b/ruby/lib/gitaly_server.rb
@@ -10,6 +10,7 @@ require_relative 'gitaly_server/ref_service.rb'
 require_relative 'gitaly_server/operations_service.rb'
 require_relative 'gitaly_server/repository_service.rb'
 require_relative 'gitaly_server/wiki_service.rb'
+require_relative 'gitaly_server/conflicts_service.rb'
 
 module GitalyServer
   REPO_PATH_HEADER = 'gitaly-repo-path'.freeze
@@ -40,5 +41,6 @@ module GitalyServer
     server.handle(OperationsService.new)
     server.handle(RepositoryService.new)
     server.handle(WikiService.new)
+    server.handle(ConflictsService.new)
   end
 end
diff --git a/ruby/lib/gitaly_server/conflicts_service.rb b/ruby/lib/gitaly_server/conflicts_service.rb
new file mode 100644
index 000000000..dc16e5b3c
--- /dev/null
+++ b/ruby/lib/gitaly_server/conflicts_service.rb
@@ -0,0 +1,5 @@
+module GitalyServer
+  class ConflictsService < Gitaly::ConflictsService::Service
+    include Utils
+  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 cb6b534ab..7e750b4eb 100644
--- a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION
+++ b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION
@@ -1 +1 @@
-0.59.0
+0.60.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 826846f79..ea9da5217 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
@@ -7,6 +7,7 @@ Package gitaly is a generated protocol buffer package.
 It is generated from these files:
 	blob.proto
 	commit.proto
+	conflicts.proto
 	deprecated-services.proto
 	diff.proto
 	namespace.proto
@@ -57,6 +58,13 @@ It has these top-level messages:
 	CommitsByMessageResponse
 	FilterShasWithSignaturesRequest
 	FilterShasWithSignaturesResponse
+	ListConflictFilesRequest
+	ConflictFileHeader
+	ConflictFile
+	ListConflictFilesResponse
+	ResolveConflictsRequestHeader
+	ResolveConflictsRequest
+	ResolveConflictsResponse
 	CommitDiffRequest
 	CommitDiffResponse
 	CommitDeltaRequest
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
new file mode 100644
index 000000000..00dee9745
--- /dev/null
+++ b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/conflicts.pb.go
@@ -0,0 +1,662 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: conflicts.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 ListConflictFilesRequest struct {
+	Repository       *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"`
+	OurCommitOid     string      `protobuf:"bytes,2,opt,name=our_commit_oid,json=ourCommitOid" json:"our_commit_oid,omitempty"`
+	TargetRepository *Repository `protobuf:"bytes,3,opt,name=target_repository,json=targetRepository" json:"target_repository,omitempty"`
+	TheirCommitOid   string      `protobuf:"bytes,4,opt,name=their_commit_oid,json=theirCommitOid" json:"their_commit_oid,omitempty"`
+}
+
+func (m *ListConflictFilesRequest) Reset()                    { *m = ListConflictFilesRequest{} }
+func (m *ListConflictFilesRequest) String() string            { return proto.CompactTextString(m) }
+func (*ListConflictFilesRequest) ProtoMessage()               {}
+func (*ListConflictFilesRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{0} }
+
+func (m *ListConflictFilesRequest) GetRepository() *Repository {
+	if m != nil {
+		return m.Repository
+	}
+	return nil
+}
+
+func (m *ListConflictFilesRequest) GetOurCommitOid() string {
+	if m != nil {
+		return m.OurCommitOid
+	}
+	return ""
+}
+
+func (m *ListConflictFilesRequest) GetTargetRepository() *Repository {
+	if m != nil {
+		return m.TargetRepository
+	}
+	return nil
+}
+
+func (m *ListConflictFilesRequest) GetTheirCommitOid() string {
+	if m != nil {
+		return m.TheirCommitOid
+	}
+	return ""
+}
+
+type ConflictFileHeader struct {
+	Repository *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"`
+	CommitOid  string      `protobuf:"bytes,2,opt,name=commit_oid,json=commitOid" json:"commit_oid,omitempty"`
+	TheirPath  []byte      `protobuf:"bytes,3,opt,name=their_path,json=theirPath,proto3" json:"their_path,omitempty"`
+	OurPath    []byte      `protobuf:"bytes,4,opt,name=our_path,json=ourPath,proto3" json:"our_path,omitempty"`
+	OurMode    int32       `protobuf:"varint,5,opt,name=our_mode,json=ourMode" json:"our_mode,omitempty"`
+}
+
+func (m *ConflictFileHeader) Reset()                    { *m = ConflictFileHeader{} }
+func (m *ConflictFileHeader) String() string            { return proto.CompactTextString(m) }
+func (*ConflictFileHeader) ProtoMessage()               {}
+func (*ConflictFileHeader) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{1} }
+
+func (m *ConflictFileHeader) GetRepository() *Repository {
+	if m != nil {
+		return m.Repository
+	}
+	return nil
+}
+
+func (m *ConflictFileHeader) GetCommitOid() string {
+	if m != nil {
+		return m.CommitOid
+	}
+	return ""
+}
+
+func (m *ConflictFileHeader) GetTheirPath() []byte {
+	if m != nil {
+		return m.TheirPath
+	}
+	return nil
+}
+
+func (m *ConflictFileHeader) GetOurPath() []byte {
+	if m != nil {
+		return m.OurPath
+	}
+	return nil
+}
+
+func (m *ConflictFileHeader) GetOurMode() int32 {
+	if m != nil {
+		return m.OurMode
+	}
+	return 0
+}
+
+type ConflictFile struct {
+	// Types that are valid to be assigned to ConflictFilePayload:
+	//	*ConflictFile_Header
+	//	*ConflictFile_Content
+	ConflictFilePayload isConflictFile_ConflictFilePayload `protobuf_oneof:"conflict_file_payload"`
+}
+
+func (m *ConflictFile) Reset()                    { *m = ConflictFile{} }
+func (m *ConflictFile) String() string            { return proto.CompactTextString(m) }
+func (*ConflictFile) ProtoMessage()               {}
+func (*ConflictFile) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{2} }
+
+type isConflictFile_ConflictFilePayload interface {
+	isConflictFile_ConflictFilePayload()
+}
+
+type ConflictFile_Header struct {
+	Header *ConflictFileHeader `protobuf:"bytes,1,opt,name=header,oneof"`
+}
+type ConflictFile_Content struct {
+	Content []byte `protobuf:"bytes,2,opt,name=content,proto3,oneof"`
+}
+
+func (*ConflictFile_Header) isConflictFile_ConflictFilePayload()  {}
+func (*ConflictFile_Content) isConflictFile_ConflictFilePayload() {}
+
+func (m *ConflictFile) GetConflictFilePayload() isConflictFile_ConflictFilePayload {
+	if m != nil {
+		return m.ConflictFilePayload
+	}
+	return nil
+}
+
+func (m *ConflictFile) GetHeader() *ConflictFileHeader {
+	if x, ok := m.GetConflictFilePayload().(*ConflictFile_Header); ok {
+		return x.Header
+	}
+	return nil
+}
+
+func (m *ConflictFile) GetContent() []byte {
+	if x, ok := m.GetConflictFilePayload().(*ConflictFile_Content); ok {
+		return x.Content
+	}
+	return nil
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*ConflictFile) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _ConflictFile_OneofMarshaler, _ConflictFile_OneofUnmarshaler, _ConflictFile_OneofSizer, []interface{}{
+		(*ConflictFile_Header)(nil),
+		(*ConflictFile_Content)(nil),
+	}
+}
+
+func _ConflictFile_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*ConflictFile)
+	// conflict_file_payload
+	switch x := m.ConflictFilePayload.(type) {
+	case *ConflictFile_Header:
+		b.EncodeVarint(1<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.Header); err != nil {
+			return err
+		}
+	case *ConflictFile_Content:
+		b.EncodeVarint(2<<3 | proto.WireBytes)
+		b.EncodeRawBytes(x.Content)
+	case nil:
+	default:
+		return fmt.Errorf("ConflictFile.ConflictFilePayload has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _ConflictFile_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*ConflictFile)
+	switch tag {
+	case 1: // conflict_file_payload.header
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(ConflictFileHeader)
+		err := b.DecodeMessage(msg)
+		m.ConflictFilePayload = &ConflictFile_Header{msg}
+		return true, err
+	case 2: // conflict_file_payload.content
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeRawBytes(true)
+		m.ConflictFilePayload = &ConflictFile_Content{x}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _ConflictFile_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*ConflictFile)
+	// conflict_file_payload
+	switch x := m.ConflictFilePayload.(type) {
+	case *ConflictFile_Header:
+		s := proto.Size(x.Header)
+		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *ConflictFile_Content:
+		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += proto.SizeVarint(uint64(len(x.Content)))
+		n += len(x.Content)
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+type ListConflictFilesResponse struct {
+	Files []*ConflictFile `protobuf:"bytes,1,rep,name=files" json:"files,omitempty"`
+}
+
+func (m *ListConflictFilesResponse) Reset()                    { *m = ListConflictFilesResponse{} }
+func (m *ListConflictFilesResponse) String() string            { return proto.CompactTextString(m) }
+func (*ListConflictFilesResponse) ProtoMessage()               {}
+func (*ListConflictFilesResponse) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{3} }
+
+func (m *ListConflictFilesResponse) GetFiles() []*ConflictFile {
+	if m != nil {
+		return m.Files
+	}
+	return nil
+}
+
+type ResolveConflictsRequestHeader struct {
+	Repository       *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"`
+	OurCommitOid     string      `protobuf:"bytes,2,opt,name=our_commit_oid,json=ourCommitOid" json:"our_commit_oid,omitempty"`
+	TargetRepository *Repository `protobuf:"bytes,3,opt,name=target_repository,json=targetRepository" json:"target_repository,omitempty"`
+	TheirCommitOid   string      `protobuf:"bytes,4,opt,name=their_commit_oid,json=theirCommitOid" json:"their_commit_oid,omitempty"`
+	SourceBranch     []byte      `protobuf:"bytes,5,opt,name=source_branch,json=sourceBranch,proto3" json:"source_branch,omitempty"`
+	TargetBranch     []byte      `protobuf:"bytes,6,opt,name=target_branch,json=targetBranch,proto3" json:"target_branch,omitempty"`
+	CommitMessage    []byte      `protobuf:"bytes,7,opt,name=commit_message,json=commitMessage,proto3" json:"commit_message,omitempty"`
+	User             *User       `protobuf:"bytes,8,opt,name=user" json:"user,omitempty"`
+}
+
+func (m *ResolveConflictsRequestHeader) Reset()                    { *m = ResolveConflictsRequestHeader{} }
+func (m *ResolveConflictsRequestHeader) String() string            { return proto.CompactTextString(m) }
+func (*ResolveConflictsRequestHeader) ProtoMessage()               {}
+func (*ResolveConflictsRequestHeader) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{4} }
+
+func (m *ResolveConflictsRequestHeader) GetRepository() *Repository {
+	if m != nil {
+		return m.Repository
+	}
+	return nil
+}
+
+func (m *ResolveConflictsRequestHeader) GetOurCommitOid() string {
+	if m != nil {
+		return m.OurCommitOid
+	}
+	return ""
+}
+
+func (m *ResolveConflictsRequestHeader) GetTargetRepository() *Repository {
+	if m != nil {
+		return m.TargetRepository
+	}
+	return nil
+}
+
+func (m *ResolveConflictsRequestHeader) GetTheirCommitOid() string {
+	if m != nil {
+		return m.TheirCommitOid
+	}
+	return ""
+}
+
+func (m *ResolveConflictsRequestHeader) GetSourceBranch() []byte {
+	if m != nil {
+		return m.SourceBranch
+	}
+	return nil
+}
+
+func (m *ResolveConflictsRequestHeader) GetTargetBranch() []byte {
+	if m != nil {
+		return m.TargetBranch
+	}
+	return nil
+}
+
+func (m *ResolveConflictsRequestHeader) GetCommitMessage() []byte {
+	if m != nil {
+		return m.CommitMessage
+	}
+	return nil
+}
+
+func (m *ResolveConflictsRequestHeader) GetUser() *User {
+	if m != nil {
+		return m.User
+	}
+	return nil
+}
+
+type ResolveConflictsRequest struct {
+	// Types that are valid to be assigned to ResolveConflictsRequestPayload:
+	//	*ResolveConflictsRequest_Header
+	//	*ResolveConflictsRequest_FilesJson
+	ResolveConflictsRequestPayload isResolveConflictsRequest_ResolveConflictsRequestPayload `protobuf_oneof:"resolve_conflicts_request_payload"`
+}
+
+func (m *ResolveConflictsRequest) Reset()                    { *m = ResolveConflictsRequest{} }
+func (m *ResolveConflictsRequest) String() string            { return proto.CompactTextString(m) }
+func (*ResolveConflictsRequest) ProtoMessage()               {}
+func (*ResolveConflictsRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{5} }
+
+type isResolveConflictsRequest_ResolveConflictsRequestPayload interface {
+	isResolveConflictsRequest_ResolveConflictsRequestPayload()
+}
+
+type ResolveConflictsRequest_Header struct {
+	Header *ResolveConflictsRequestHeader `protobuf:"bytes,1,opt,name=header,oneof"`
+}
+type ResolveConflictsRequest_FilesJson struct {
+	FilesJson []byte `protobuf:"bytes,2,opt,name=files_json,json=filesJson,proto3,oneof"`
+}
+
+func (*ResolveConflictsRequest_Header) isResolveConflictsRequest_ResolveConflictsRequestPayload()    {}
+func (*ResolveConflictsRequest_FilesJson) isResolveConflictsRequest_ResolveConflictsRequestPayload() {}
+
+func (m *ResolveConflictsRequest) GetResolveConflictsRequestPayload() isResolveConflictsRequest_ResolveConflictsRequestPayload {
+	if m != nil {
+		return m.ResolveConflictsRequestPayload
+	}
+	return nil
+}
+
+func (m *ResolveConflictsRequest) GetHeader() *ResolveConflictsRequestHeader {
+	if x, ok := m.GetResolveConflictsRequestPayload().(*ResolveConflictsRequest_Header); ok {
+		return x.Header
+	}
+	return nil
+}
+
+func (m *ResolveConflictsRequest) GetFilesJson() []byte {
+	if x, ok := m.GetResolveConflictsRequestPayload().(*ResolveConflictsRequest_FilesJson); ok {
+		return x.FilesJson
+	}
+	return nil
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*ResolveConflictsRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _ResolveConflictsRequest_OneofMarshaler, _ResolveConflictsRequest_OneofUnmarshaler, _ResolveConflictsRequest_OneofSizer, []interface{}{
+		(*ResolveConflictsRequest_Header)(nil),
+		(*ResolveConflictsRequest_FilesJson)(nil),
+	}
+}
+
+func _ResolveConflictsRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*ResolveConflictsRequest)
+	// resolve_conflicts_request_payload
+	switch x := m.ResolveConflictsRequestPayload.(type) {
+	case *ResolveConflictsRequest_Header:
+		b.EncodeVarint(1<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.Header); err != nil {
+			return err
+		}
+	case *ResolveConflictsRequest_FilesJson:
+		b.EncodeVarint(2<<3 | proto.WireBytes)
+		b.EncodeRawBytes(x.FilesJson)
+	case nil:
+	default:
+		return fmt.Errorf("ResolveConflictsRequest.ResolveConflictsRequestPayload has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _ResolveConflictsRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*ResolveConflictsRequest)
+	switch tag {
+	case 1: // resolve_conflicts_request_payload.header
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(ResolveConflictsRequestHeader)
+		err := b.DecodeMessage(msg)
+		m.ResolveConflictsRequestPayload = &ResolveConflictsRequest_Header{msg}
+		return true, err
+	case 2: // resolve_conflicts_request_payload.files_json
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeRawBytes(true)
+		m.ResolveConflictsRequestPayload = &ResolveConflictsRequest_FilesJson{x}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _ResolveConflictsRequest_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*ResolveConflictsRequest)
+	// resolve_conflicts_request_payload
+	switch x := m.ResolveConflictsRequestPayload.(type) {
+	case *ResolveConflictsRequest_Header:
+		s := proto.Size(x.Header)
+		n += proto.SizeVarint(1<<3 | proto.WireBytes)
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *ResolveConflictsRequest_FilesJson:
+		n += proto.SizeVarint(2<<3 | proto.WireBytes)
+		n += proto.SizeVarint(uint64(len(x.FilesJson)))
+		n += len(x.FilesJson)
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
+type ResolveConflictsResponse struct {
+	ResolutionError string `protobuf:"bytes,1,opt,name=resolution_error,json=resolutionError" json:"resolution_error,omitempty"`
+}
+
+func (m *ResolveConflictsResponse) Reset()                    { *m = ResolveConflictsResponse{} }
+func (m *ResolveConflictsResponse) String() string            { return proto.CompactTextString(m) }
+func (*ResolveConflictsResponse) ProtoMessage()               {}
+func (*ResolveConflictsResponse) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{6} }
+
+func (m *ResolveConflictsResponse) GetResolutionError() string {
+	if m != nil {
+		return m.ResolutionError
+	}
+	return ""
+}
+
+func init() {
+	proto.RegisterType((*ListConflictFilesRequest)(nil), "gitaly.ListConflictFilesRequest")
+	proto.RegisterType((*ConflictFileHeader)(nil), "gitaly.ConflictFileHeader")
+	proto.RegisterType((*ConflictFile)(nil), "gitaly.ConflictFile")
+	proto.RegisterType((*ListConflictFilesResponse)(nil), "gitaly.ListConflictFilesResponse")
+	proto.RegisterType((*ResolveConflictsRequestHeader)(nil), "gitaly.ResolveConflictsRequestHeader")
+	proto.RegisterType((*ResolveConflictsRequest)(nil), "gitaly.ResolveConflictsRequest")
+	proto.RegisterType((*ResolveConflictsResponse)(nil), "gitaly.ResolveConflictsResponse")
+}
+
+// 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 ConflictsService service
+
+type ConflictsServiceClient interface {
+	ListConflictFiles(ctx context.Context, in *ListConflictFilesRequest, opts ...grpc.CallOption) (ConflictsService_ListConflictFilesClient, error)
+	ResolveConflicts(ctx context.Context, opts ...grpc.CallOption) (ConflictsService_ResolveConflictsClient, error)
+}
+
+type conflictsServiceClient struct {
+	cc *grpc.ClientConn
+}
+
+func NewConflictsServiceClient(cc *grpc.ClientConn) ConflictsServiceClient {
+	return &conflictsServiceClient{cc}
+}
+
+func (c *conflictsServiceClient) ListConflictFiles(ctx context.Context, in *ListConflictFilesRequest, opts ...grpc.CallOption) (ConflictsService_ListConflictFilesClient, error) {
+	stream, err := grpc.NewClientStream(ctx, &_ConflictsService_serviceDesc.Streams[0], c.cc, "/gitaly.ConflictsService/ListConflictFiles", opts...)
+	if err != nil {
+		return nil, err
+	}
+	x := &conflictsServiceListConflictFilesClient{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 ConflictsService_ListConflictFilesClient interface {
+	Recv() (*ListConflictFilesResponse, error)
+	grpc.ClientStream
+}
+
+type conflictsServiceListConflictFilesClient struct {
+	grpc.ClientStream
+}
+
+func (x *conflictsServiceListConflictFilesClient) Recv() (*ListConflictFilesResponse, error) {
+	m := new(ListConflictFilesResponse)
+	if err := x.ClientStream.RecvMsg(m); err != nil {
+		return nil, err
+	}
+	return m, nil
+}
+
+func (c *conflictsServiceClient) ResolveConflicts(ctx context.Context, opts ...grpc.CallOption) (ConflictsService_ResolveConflictsClient, error) {
+	stream, err := grpc.NewClientStream(ctx, &_ConflictsService_serviceDesc.Streams[1], c.cc, "/gitaly.ConflictsService/ResolveConflicts", opts...)
+	if err != nil {
+		return nil, err
+	}
+	x := &conflictsServiceResolveConflictsClient{stream}
+	return x, nil
+}
+
+type ConflictsService_ResolveConflictsClient interface {
+	Send(*ResolveConflictsRequest) error
+	CloseAndRecv() (*ResolveConflictsResponse, error)
+	grpc.ClientStream
+}
+
+type conflictsServiceResolveConflictsClient struct {
+	grpc.ClientStream
+}
+
+func (x *conflictsServiceResolveConflictsClient) Send(m *ResolveConflictsRequest) error {
+	return x.ClientStream.SendMsg(m)
+}
+
+func (x *conflictsServiceResolveConflictsClient) CloseAndRecv() (*ResolveConflictsResponse, error) {
+	if err := x.ClientStream.CloseSend(); err != nil {
+		return nil, err
+	}
+	m := new(ResolveConflictsResponse)
+	if err := x.ClientStream.RecvMsg(m); err != nil {
+		return nil, err
+	}
+	return m, nil
+}
+
+// Server API for ConflictsService service
+
+type ConflictsServiceServer interface {
+	ListConflictFiles(*ListConflictFilesRequest, ConflictsService_ListConflictFilesServer) error
+	ResolveConflicts(ConflictsService_ResolveConflictsServer) error
+}
+
+func RegisterConflictsServiceServer(s *grpc.Server, srv ConflictsServiceServer) {
+	s.RegisterService(&_ConflictsService_serviceDesc, srv)
+}
+
+func _ConflictsService_ListConflictFiles_Handler(srv interface{}, stream grpc.ServerStream) error {
+	m := new(ListConflictFilesRequest)
+	if err := stream.RecvMsg(m); err != nil {
+		return err
+	}
+	return srv.(ConflictsServiceServer).ListConflictFiles(m, &conflictsServiceListConflictFilesServer{stream})
+}
+
+type ConflictsService_ListConflictFilesServer interface {
+	Send(*ListConflictFilesResponse) error
+	grpc.ServerStream
+}
+
+type conflictsServiceListConflictFilesServer struct {
+	grpc.ServerStream
+}
+
+func (x *conflictsServiceListConflictFilesServer) Send(m *ListConflictFilesResponse) error {
+	return x.ServerStream.SendMsg(m)
+}
+
+func _ConflictsService_ResolveConflicts_Handler(srv interface{}, stream grpc.ServerStream) error {
+	return srv.(ConflictsServiceServer).ResolveConflicts(&conflictsServiceResolveConflictsServer{stream})
+}
+
+type ConflictsService_ResolveConflictsServer interface {
+	SendAndClose(*ResolveConflictsResponse) error
+	Recv() (*ResolveConflictsRequest, error)
+	grpc.ServerStream
+}
+
+type conflictsServiceResolveConflictsServer struct {
+	grpc.ServerStream
+}
+
+func (x *conflictsServiceResolveConflictsServer) SendAndClose(m *ResolveConflictsResponse) error {
+	return x.ServerStream.SendMsg(m)
+}
+
+func (x *conflictsServiceResolveConflictsServer) Recv() (*ResolveConflictsRequest, error) {
+	m := new(ResolveConflictsRequest)
+	if err := x.ServerStream.RecvMsg(m); err != nil {
+		return nil, err
+	}
+	return m, nil
+}
+
+var _ConflictsService_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "gitaly.ConflictsService",
+	HandlerType: (*ConflictsServiceServer)(nil),
+	Methods:     []grpc.MethodDesc{},
+	Streams: []grpc.StreamDesc{
+		{
+			StreamName:    "ListConflictFiles",
+			Handler:       _ConflictsService_ListConflictFiles_Handler,
+			ServerStreams: true,
+		},
+		{
+			StreamName:    "ResolveConflicts",
+			Handler:       _ConflictsService_ResolveConflicts_Handler,
+			ClientStreams: true,
+		},
+	},
+	Metadata: "conflicts.proto",
+}
+
+func init() { proto.RegisterFile("conflicts.proto", fileDescriptor2) }
+
+var fileDescriptor2 = []byte{
+	// 573 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x54, 0xdd, 0x6a, 0x13, 0x41,
+	0x18, 0xed, 0xb6, 0xf9, 0x69, 0xbe, 0x6e, 0xd3, 0x74, 0x50, 0xba, 0x0d, 0x84, 0x6e, 0xb7, 0x16,
+	0x56, 0x2f, 0x82, 0x44, 0xef, 0x0b, 0x29, 0xd5, 0x20, 0x16, 0x65, 0xc4, 0x0b, 0x41, 0x58, 0xb6,
+	0xbb, 0x5f, 0xb3, 0x23, 0x9b, 0x9d, 0x38, 0x33, 0x5b, 0xc8, 0xdb, 0xf8, 0x20, 0xbe, 0x81, 0x0f,
+	0xe1, 0x63, 0x78, 0x2b, 0x99, 0xd9, 0xdd, 0xa4, 0x4d, 0x53, 0x41, 0x6f, 0xbc, 0x3d, 0xdf, 0xe1,
+	0x3b, 0xe7, 0xcc, 0x77, 0x18, 0xd8, 0x8b, 0x78, 0x76, 0x9d, 0xb2, 0x48, 0xc9, 0xfe, 0x54, 0x70,
+	0xc5, 0x49, 0x63, 0xcc, 0x54, 0x98, 0xce, 0xba, 0xb6, 0x4c, 0x42, 0x81, 0xb1, 0x41, 0xbd, 0x9f,
+	0x16, 0x38, 0x6f, 0x99, 0x54, 0xe7, 0x05, 0xfb, 0x15, 0x4b, 0x51, 0x52, 0xfc, 0x9a, 0xa3, 0x54,
+	0x64, 0x00, 0x20, 0x70, 0xca, 0x25, 0x53, 0x5c, 0xcc, 0x1c, 0xcb, 0xb5, 0xfc, 0x9d, 0x01, 0xe9,
+	0x9b, 0x3d, 0x7d, 0x5a, 0x4d, 0xe8, 0x12, 0x8b, 0x3c, 0x81, 0x36, 0xcf, 0x45, 0x10, 0xf1, 0xc9,
+	0x84, 0xa9, 0x80, 0xb3, 0xd8, 0xd9, 0x74, 0x2d, 0xbf, 0x45, 0x6d, 0x9e, 0x8b, 0x73, 0x0d, 0xbe,
+	0x63, 0x31, 0x39, 0x83, 0x7d, 0x15, 0x8a, 0x31, 0xaa, 0x60, 0x49, 0x60, 0x6b, 0xad, 0x40, 0xc7,
+	0x90, 0x17, 0x08, 0xf1, 0xa1, 0xa3, 0x12, 0x64, 0xb7, 0x84, 0x6a, 0x5a, 0xa8, 0xad, 0xf1, 0x4a,
+	0xca, 0xfb, 0x6e, 0x01, 0x59, 0x4e, 0x37, 0xc2, 0x30, 0x46, 0xf1, 0x57, 0xd9, 0x7a, 0x00, 0x2b,
+	0xb9, 0x5a, 0x51, 0x15, 0xaa, 0x07, 0x60, 0x3c, 0x4d, 0x43, 0x95, 0xe8, 0x34, 0x36, 0x6d, 0x69,
+	0xe4, 0x7d, 0xa8, 0x12, 0x72, 0x08, 0xdb, 0xf3, 0x97, 0xd1, 0xc3, 0x9a, 0x1e, 0x36, 0x79, 0x7e,
+	0x6b, 0x34, 0xe1, 0x31, 0x3a, 0x75, 0xd7, 0xf2, 0xeb, 0x7a, 0x74, 0xc9, 0x63, 0xf4, 0x66, 0x60,
+	0x2f, 0xbb, 0x27, 0x2f, 0xa1, 0x91, 0xe8, 0x04, 0x85, 0xe7, 0x6e, 0xe9, 0x79, 0x35, 0xe3, 0x68,
+	0x83, 0x16, 0x5c, 0xd2, 0x85, 0x66, 0xc4, 0x33, 0x85, 0x99, 0xd2, 0xb6, 0xed, 0xd1, 0x06, 0x2d,
+	0x81, 0xe1, 0x01, 0x3c, 0x2e, 0xbb, 0x12, 0x5c, 0xb3, 0x14, 0x83, 0x69, 0x38, 0x4b, 0x79, 0x18,
+	0x7b, 0xaf, 0xe1, 0xf0, 0x9e, 0x6a, 0xc8, 0x29, 0xcf, 0x24, 0x92, 0x67, 0x50, 0x9f, 0x93, 0xa5,
+	0x63, 0xb9, 0x5b, 0xfe, 0xce, 0xe0, 0xd1, 0x7d, 0x36, 0xa8, 0xa1, 0x78, 0xbf, 0x36, 0xa1, 0x47,
+	0x51, 0xf2, 0xf4, 0x06, 0xcb, 0x71, 0xd9, 0xb1, 0x7f, 0xb8, 0xc6, 0xff, 0xd6, 0x34, 0x72, 0x02,
+	0xbb, 0x92, 0xe7, 0x22, 0xc2, 0xe0, 0x4a, 0x84, 0x59, 0x94, 0xe8, 0x53, 0xda, 0xd4, 0x36, 0xe0,
+	0x50, 0x63, 0x73, 0x52, 0xe1, 0xa7, 0x20, 0x35, 0x0c, 0xc9, 0x80, 0x05, 0xe9, 0x14, 0xda, 0x85,
+	0xda, 0x04, 0xa5, 0x0c, 0xc7, 0xe8, 0x34, 0x35, 0x6b, 0xd7, 0xa0, 0x97, 0x06, 0x24, 0x2e, 0xd4,
+	0x72, 0x89, 0xc2, 0xd9, 0xd6, 0x71, 0xec, 0x32, 0xce, 0x47, 0x89, 0x82, 0xea, 0x89, 0xf7, 0xcd,
+	0x82, 0x83, 0x35, 0x2f, 0x4f, 0xce, 0xee, 0x34, 0xe9, 0x74, 0xf1, 0x1c, 0x0f, 0x9c, 0x6a, 0xa9,
+	0x54, 0x47, 0x00, 0xfa, 0xbe, 0xc1, 0x17, 0xc9, 0xb3, 0xaa, 0x57, 0x2d, 0x8d, 0xbd, 0x91, 0x3c,
+	0x1b, 0x9e, 0xc0, 0xb1, 0x30, 0xbb, 0x82, 0xea, 0x37, 0x0a, 0x84, 0xd9, 0x56, 0xb5, 0xec, 0x02,
+	0x9c, 0x55, 0xc1, 0xa2, 0x64, 0x4f, 0xa1, 0xa3, 0x17, 0xe4, 0x8a, 0xf1, 0x2c, 0x40, 0x21, 0xb8,
+	0x31, 0xdb, 0xa2, 0x7b, 0x0b, 0xfc, 0x62, 0x0e, 0x0f, 0x7e, 0x58, 0xd0, 0xa9, 0x16, 0x7c, 0x40,
+	0x71, 0xc3, 0x22, 0x24, 0x9f, 0x61, 0x7f, 0xa5, 0xc1, 0xc4, 0x2d, 0x73, 0xae, 0xfb, 0xf7, 0xba,
+	0xc7, 0x0f, 0x30, 0x8c, 0x33, 0x6f, 0xe3, 0xb9, 0x45, 0x3e, 0x41, 0xe7, 0xae, 0x73, 0x72, 0xf4,
+	0x87, 0x47, 0xec, 0xba, 0xeb, 0x09, 0xe5, 0x6a, 0xdf, 0xba, 0x6a, 0xe8, 0xdf, 0xf9, 0xc5, 0xef,
+	0x00, 0x00, 0x00, 0xff, 0xff, 0xc0, 0x74, 0x28, 0x6e, 0xc6, 0x05, 0x00, 0x00,
+}
diff --git a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/deprecated-services.pb.go b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/deprecated-services.pb.go
index 1996d5b39..7253e928f 100644
--- a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/deprecated-services.pb.go
+++ b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/deprecated-services.pb.go
@@ -1105,9 +1105,9 @@ var _SSH_serviceDesc = grpc.ServiceDesc{
 	Metadata: "deprecated-services.proto",
 }
 
-func init() { proto.RegisterFile("deprecated-services.proto", fileDescriptor2) }
+func init() { proto.RegisterFile("deprecated-services.proto", fileDescriptor3) }
 
-var fileDescriptor2 = []byte{
+var fileDescriptor3 = []byte{
 	// 534 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x94, 0x5d, 0x6e, 0xd3, 0x40,
 	0x10, 0x80, 0x31, 0x41, 0x91, 0x32, 0xa1, 0x0d, 0x6c, 0x85, 0x68, 0x0c, 0x4d, 0xda, 0x0a, 0x24,
diff --git a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/diff.pb.go b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/diff.pb.go
index 74c223ffa..fce1deadc 100644
--- a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/diff.pb.go
+++ b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/diff.pb.go
@@ -36,7 +36,7 @@ type CommitDiffRequest struct {
 func (m *CommitDiffRequest) Reset()                    { *m = CommitDiffRequest{} }
 func (m *CommitDiffRequest) String() string            { return proto.CompactTextString(m) }
 func (*CommitDiffRequest) ProtoMessage()               {}
-func (*CommitDiffRequest) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{0} }
+func (*CommitDiffRequest) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{0} }
 
 func (m *CommitDiffRequest) GetRepository() *Repository {
 	if m != nil {
@@ -150,7 +150,7 @@ type CommitDiffResponse struct {
 func (m *CommitDiffResponse) Reset()                    { *m = CommitDiffResponse{} }
 func (m *CommitDiffResponse) String() string            { return proto.CompactTextString(m) }
 func (*CommitDiffResponse) ProtoMessage()               {}
-func (*CommitDiffResponse) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{1} }
+func (*CommitDiffResponse) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{1} }
 
 func (m *CommitDiffResponse) GetFromPath() []byte {
 	if m != nil {
@@ -239,7 +239,7 @@ type CommitDeltaRequest struct {
 func (m *CommitDeltaRequest) Reset()                    { *m = CommitDeltaRequest{} }
 func (m *CommitDeltaRequest) String() string            { return proto.CompactTextString(m) }
 func (*CommitDeltaRequest) ProtoMessage()               {}
-func (*CommitDeltaRequest) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{2} }
+func (*CommitDeltaRequest) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{2} }
 
 func (m *CommitDeltaRequest) GetRepository() *Repository {
 	if m != nil {
@@ -282,7 +282,7 @@ type CommitDelta struct {
 func (m *CommitDelta) Reset()                    { *m = CommitDelta{} }
 func (m *CommitDelta) String() string            { return proto.CompactTextString(m) }
 func (*CommitDelta) ProtoMessage()               {}
-func (*CommitDelta) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{3} }
+func (*CommitDelta) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{3} }
 
 func (m *CommitDelta) GetFromPath() []byte {
 	if m != nil {
@@ -333,7 +333,7 @@ type CommitDeltaResponse struct {
 func (m *CommitDeltaResponse) Reset()                    { *m = CommitDeltaResponse{} }
 func (m *CommitDeltaResponse) String() string            { return proto.CompactTextString(m) }
 func (*CommitDeltaResponse) ProtoMessage()               {}
-func (*CommitDeltaResponse) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{4} }
+func (*CommitDeltaResponse) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{4} }
 
 func (m *CommitDeltaResponse) GetDeltas() []*CommitDelta {
 	if m != nil {
@@ -350,7 +350,7 @@ type CommitPatchRequest struct {
 func (m *CommitPatchRequest) Reset()                    { *m = CommitPatchRequest{} }
 func (m *CommitPatchRequest) String() string            { return proto.CompactTextString(m) }
 func (*CommitPatchRequest) ProtoMessage()               {}
-func (*CommitPatchRequest) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{5} }
+func (*CommitPatchRequest) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{5} }
 
 func (m *CommitPatchRequest) GetRepository() *Repository {
 	if m != nil {
@@ -373,7 +373,7 @@ type CommitPatchResponse struct {
 func (m *CommitPatchResponse) Reset()                    { *m = CommitPatchResponse{} }
 func (m *CommitPatchResponse) String() string            { return proto.CompactTextString(m) }
 func (*CommitPatchResponse) ProtoMessage()               {}
-func (*CommitPatchResponse) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{6} }
+func (*CommitPatchResponse) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{6} }
 
 func (m *CommitPatchResponse) GetData() []byte {
 	if m != nil {
@@ -391,7 +391,7 @@ type RawDiffRequest struct {
 func (m *RawDiffRequest) Reset()                    { *m = RawDiffRequest{} }
 func (m *RawDiffRequest) String() string            { return proto.CompactTextString(m) }
 func (*RawDiffRequest) ProtoMessage()               {}
-func (*RawDiffRequest) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{7} }
+func (*RawDiffRequest) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{7} }
 
 func (m *RawDiffRequest) GetRepository() *Repository {
 	if m != nil {
@@ -421,7 +421,7 @@ type RawDiffResponse struct {
 func (m *RawDiffResponse) Reset()                    { *m = RawDiffResponse{} }
 func (m *RawDiffResponse) String() string            { return proto.CompactTextString(m) }
 func (*RawDiffResponse) ProtoMessage()               {}
-func (*RawDiffResponse) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{8} }
+func (*RawDiffResponse) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{8} }
 
 func (m *RawDiffResponse) GetData() []byte {
 	if m != nil {
@@ -439,7 +439,7 @@ type RawPatchRequest struct {
 func (m *RawPatchRequest) Reset()                    { *m = RawPatchRequest{} }
 func (m *RawPatchRequest) String() string            { return proto.CompactTextString(m) }
 func (*RawPatchRequest) ProtoMessage()               {}
-func (*RawPatchRequest) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{9} }
+func (*RawPatchRequest) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{9} }
 
 func (m *RawPatchRequest) GetRepository() *Repository {
 	if m != nil {
@@ -469,7 +469,7 @@ type RawPatchResponse struct {
 func (m *RawPatchResponse) Reset()                    { *m = RawPatchResponse{} }
 func (m *RawPatchResponse) String() string            { return proto.CompactTextString(m) }
 func (*RawPatchResponse) ProtoMessage()               {}
-func (*RawPatchResponse) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{10} }
+func (*RawPatchResponse) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{10} }
 
 func (m *RawPatchResponse) GetData() []byte {
 	if m != nil {
@@ -835,9 +835,9 @@ var _DiffService_serviceDesc = grpc.ServiceDesc{
 	Metadata: "diff.proto",
 }
 
-func init() { proto.RegisterFile("diff.proto", fileDescriptor3) }
+func init() { proto.RegisterFile("diff.proto", fileDescriptor4) }
 
-var fileDescriptor3 = []byte{
+var fileDescriptor4 = []byte{
 	// 753 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x56, 0x4d, 0x6f, 0xdb, 0x46,
 	0x10, 0x2d, 0xf5, 0x41, 0x51, 0x23, 0x5a, 0x76, 0xd7, 0x85, 0x4d, 0xcb, 0x3d, 0x08, 0x44, 0xed,
diff --git a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/namespace.pb.go b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/namespace.pb.go
index e738cc870..bc9c57561 100644
--- a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/namespace.pb.go
+++ b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/namespace.pb.go
@@ -25,7 +25,7 @@ type AddNamespaceRequest struct {
 func (m *AddNamespaceRequest) Reset()                    { *m = AddNamespaceRequest{} }
 func (m *AddNamespaceRequest) String() string            { return proto.CompactTextString(m) }
 func (*AddNamespaceRequest) ProtoMessage()               {}
-func (*AddNamespaceRequest) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{0} }
+func (*AddNamespaceRequest) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{0} }
 
 func (m *AddNamespaceRequest) GetStorageName() string {
 	if m != nil {
@@ -49,7 +49,7 @@ type RemoveNamespaceRequest struct {
 func (m *RemoveNamespaceRequest) Reset()                    { *m = RemoveNamespaceRequest{} }
 func (m *RemoveNamespaceRequest) String() string            { return proto.CompactTextString(m) }
 func (*RemoveNamespaceRequest) ProtoMessage()               {}
-func (*RemoveNamespaceRequest) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{1} }
+func (*RemoveNamespaceRequest) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{1} }
 
 func (m *RemoveNamespaceRequest) GetStorageName() string {
 	if m != nil {
@@ -74,7 +74,7 @@ type RenameNamespaceRequest struct {
 func (m *RenameNamespaceRequest) Reset()                    { *m = RenameNamespaceRequest{} }
 func (m *RenameNamespaceRequest) String() string            { return proto.CompactTextString(m) }
 func (*RenameNamespaceRequest) ProtoMessage()               {}
-func (*RenameNamespaceRequest) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{2} }
+func (*RenameNamespaceRequest) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{2} }
 
 func (m *RenameNamespaceRequest) GetStorageName() string {
 	if m != nil {
@@ -105,7 +105,7 @@ type NamespaceExistsRequest struct {
 func (m *NamespaceExistsRequest) Reset()                    { *m = NamespaceExistsRequest{} }
 func (m *NamespaceExistsRequest) String() string            { return proto.CompactTextString(m) }
 func (*NamespaceExistsRequest) ProtoMessage()               {}
-func (*NamespaceExistsRequest) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{3} }
+func (*NamespaceExistsRequest) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{3} }
 
 func (m *NamespaceExistsRequest) GetStorageName() string {
 	if m != nil {
@@ -128,7 +128,7 @@ type NamespaceExistsResponse struct {
 func (m *NamespaceExistsResponse) Reset()                    { *m = NamespaceExistsResponse{} }
 func (m *NamespaceExistsResponse) String() string            { return proto.CompactTextString(m) }
 func (*NamespaceExistsResponse) ProtoMessage()               {}
-func (*NamespaceExistsResponse) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{4} }
+func (*NamespaceExistsResponse) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{4} }
 
 func (m *NamespaceExistsResponse) GetExists() bool {
 	if m != nil {
@@ -143,7 +143,7 @@ type AddNamespaceResponse struct {
 func (m *AddNamespaceResponse) Reset()                    { *m = AddNamespaceResponse{} }
 func (m *AddNamespaceResponse) String() string            { return proto.CompactTextString(m) }
 func (*AddNamespaceResponse) ProtoMessage()               {}
-func (*AddNamespaceResponse) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{5} }
+func (*AddNamespaceResponse) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{5} }
 
 type RemoveNamespaceResponse struct {
 }
@@ -151,7 +151,7 @@ type RemoveNamespaceResponse struct {
 func (m *RemoveNamespaceResponse) Reset()                    { *m = RemoveNamespaceResponse{} }
 func (m *RemoveNamespaceResponse) String() string            { return proto.CompactTextString(m) }
 func (*RemoveNamespaceResponse) ProtoMessage()               {}
-func (*RemoveNamespaceResponse) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{6} }
+func (*RemoveNamespaceResponse) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{6} }
 
 type RenameNamespaceResponse struct {
 }
@@ -159,7 +159,7 @@ type RenameNamespaceResponse struct {
 func (m *RenameNamespaceResponse) Reset()                    { *m = RenameNamespaceResponse{} }
 func (m *RenameNamespaceResponse) String() string            { return proto.CompactTextString(m) }
 func (*RenameNamespaceResponse) ProtoMessage()               {}
-func (*RenameNamespaceResponse) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{7} }
+func (*RenameNamespaceResponse) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{7} }
 
 func init() {
 	proto.RegisterType((*AddNamespaceRequest)(nil), "gitaly.AddNamespaceRequest")
@@ -343,9 +343,9 @@ var _NamespaceService_serviceDesc = grpc.ServiceDesc{
 	Metadata: "namespace.proto",
 }
 
-func init() { proto.RegisterFile("namespace.proto", fileDescriptor4) }
+func init() { proto.RegisterFile("namespace.proto", fileDescriptor5) }
 
-var fileDescriptor4 = []byte{
+var fileDescriptor5 = []byte{
 	// 291 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0xcf, 0x4b, 0xcc, 0x4d,
 	0x2d, 0x2e, 0x48, 0x4c, 0x4e, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x4b, 0xcf, 0x2c,
diff --git a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/notifications.pb.go b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/notifications.pb.go
index 295eb439b..de7eac2e4 100644
--- a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/notifications.pb.go
+++ b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/notifications.pb.go
@@ -24,7 +24,7 @@ type PostReceiveRequest struct {
 func (m *PostReceiveRequest) Reset()                    { *m = PostReceiveRequest{} }
 func (m *PostReceiveRequest) String() string            { return proto.CompactTextString(m) }
 func (*PostReceiveRequest) ProtoMessage()               {}
-func (*PostReceiveRequest) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{0} }
+func (*PostReceiveRequest) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{0} }
 
 func (m *PostReceiveRequest) GetRepository() *Repository {
 	if m != nil {
@@ -39,7 +39,7 @@ type PostReceiveResponse struct {
 func (m *PostReceiveResponse) Reset()                    { *m = PostReceiveResponse{} }
 func (m *PostReceiveResponse) String() string            { return proto.CompactTextString(m) }
 func (*PostReceiveResponse) ProtoMessage()               {}
-func (*PostReceiveResponse) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{1} }
+func (*PostReceiveResponse) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{1} }
 
 func init() {
 	proto.RegisterType((*PostReceiveRequest)(nil), "gitaly.PostReceiveRequest")
@@ -118,9 +118,9 @@ var _NotificationService_serviceDesc = grpc.ServiceDesc{
 	Metadata: "notifications.proto",
 }
 
-func init() { proto.RegisterFile("notifications.proto", fileDescriptor5) }
+func init() { proto.RegisterFile("notifications.proto", fileDescriptor6) }
 
-var fileDescriptor5 = []byte{
+var fileDescriptor6 = []byte{
 	// 170 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0xce, 0xcb, 0x2f, 0xc9,
 	0x4c, 0xcb, 0x4c, 0x4e, 0x2c, 0xc9, 0xcc, 0xcf, 0x2b, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17,
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 978cb9019..f81f53deb 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
@@ -27,7 +27,7 @@ type UserCreateBranchRequest struct {
 func (m *UserCreateBranchRequest) Reset()                    { *m = UserCreateBranchRequest{} }
 func (m *UserCreateBranchRequest) String() string            { return proto.CompactTextString(m) }
 func (*UserCreateBranchRequest) ProtoMessage()               {}
-func (*UserCreateBranchRequest) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{0} }
+func (*UserCreateBranchRequest) Descriptor() ([]byte, []int) { return fileDescriptor7, []int{0} }
 
 func (m *UserCreateBranchRequest) GetRepository() *Repository {
 	if m != nil {
@@ -67,7 +67,7 @@ type UserCreateBranchResponse struct {
 func (m *UserCreateBranchResponse) Reset()                    { *m = UserCreateBranchResponse{} }
 func (m *UserCreateBranchResponse) String() string            { return proto.CompactTextString(m) }
 func (*UserCreateBranchResponse) ProtoMessage()               {}
-func (*UserCreateBranchResponse) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{1} }
+func (*UserCreateBranchResponse) Descriptor() ([]byte, []int) { return fileDescriptor7, []int{1} }
 
 func (m *UserCreateBranchResponse) GetBranch() *Branch {
 	if m != nil {
@@ -92,7 +92,7 @@ type UserDeleteBranchRequest struct {
 func (m *UserDeleteBranchRequest) Reset()                    { *m = UserDeleteBranchRequest{} }
 func (m *UserDeleteBranchRequest) String() string            { return proto.CompactTextString(m) }
 func (*UserDeleteBranchRequest) ProtoMessage()               {}
-func (*UserDeleteBranchRequest) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{2} }
+func (*UserDeleteBranchRequest) Descriptor() ([]byte, []int) { return fileDescriptor7, []int{2} }
 
 func (m *UserDeleteBranchRequest) GetRepository() *Repository {
 	if m != nil {
@@ -122,7 +122,7 @@ type UserDeleteBranchResponse struct {
 func (m *UserDeleteBranchResponse) Reset()                    { *m = UserDeleteBranchResponse{} }
 func (m *UserDeleteBranchResponse) String() string            { return proto.CompactTextString(m) }
 func (*UserDeleteBranchResponse) ProtoMessage()               {}
-func (*UserDeleteBranchResponse) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{3} }
+func (*UserDeleteBranchResponse) Descriptor() ([]byte, []int) { return fileDescriptor7, []int{3} }
 
 func (m *UserDeleteBranchResponse) GetPreReceiveError() string {
 	if m != nil {
@@ -140,7 +140,7 @@ type UserDeleteTagRequest struct {
 func (m *UserDeleteTagRequest) Reset()                    { *m = UserDeleteTagRequest{} }
 func (m *UserDeleteTagRequest) String() string            { return proto.CompactTextString(m) }
 func (*UserDeleteTagRequest) ProtoMessage()               {}
-func (*UserDeleteTagRequest) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{4} }
+func (*UserDeleteTagRequest) Descriptor() ([]byte, []int) { return fileDescriptor7, []int{4} }
 
 func (m *UserDeleteTagRequest) GetRepository() *Repository {
 	if m != nil {
@@ -170,7 +170,7 @@ type UserDeleteTagResponse struct {
 func (m *UserDeleteTagResponse) Reset()                    { *m = UserDeleteTagResponse{} }
 func (m *UserDeleteTagResponse) String() string            { return proto.CompactTextString(m) }
 func (*UserDeleteTagResponse) ProtoMessage()               {}
-func (*UserDeleteTagResponse) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{5} }
+func (*UserDeleteTagResponse) Descriptor() ([]byte, []int) { return fileDescriptor7, []int{5} }
 
 func (m *UserDeleteTagResponse) GetPreReceiveError() string {
 	if m != nil {
@@ -190,7 +190,7 @@ type UserCreateTagRequest struct {
 func (m *UserCreateTagRequest) Reset()                    { *m = UserCreateTagRequest{} }
 func (m *UserCreateTagRequest) String() string            { return proto.CompactTextString(m) }
 func (*UserCreateTagRequest) ProtoMessage()               {}
-func (*UserCreateTagRequest) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{6} }
+func (*UserCreateTagRequest) Descriptor() ([]byte, []int) { return fileDescriptor7, []int{6} }
 
 func (m *UserCreateTagRequest) GetRepository() *Repository {
 	if m != nil {
@@ -236,7 +236,7 @@ type UserCreateTagResponse struct {
 func (m *UserCreateTagResponse) Reset()                    { *m = UserCreateTagResponse{} }
 func (m *UserCreateTagResponse) String() string            { return proto.CompactTextString(m) }
 func (*UserCreateTagResponse) ProtoMessage()               {}
-func (*UserCreateTagResponse) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{7} }
+func (*UserCreateTagResponse) Descriptor() ([]byte, []int) { return fileDescriptor7, []int{7} }
 
 func (m *UserCreateTagResponse) GetTag() *Tag {
 	if m != nil {
@@ -274,7 +274,7 @@ type UserMergeBranchRequest struct {
 func (m *UserMergeBranchRequest) Reset()                    { *m = UserMergeBranchRequest{} }
 func (m *UserMergeBranchRequest) String() string            { return proto.CompactTextString(m) }
 func (*UserMergeBranchRequest) ProtoMessage()               {}
-func (*UserMergeBranchRequest) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{8} }
+func (*UserMergeBranchRequest) Descriptor() ([]byte, []int) { return fileDescriptor7, []int{8} }
 
 func (m *UserMergeBranchRequest) GetRepository() *Repository {
 	if m != nil {
@@ -330,7 +330,7 @@ type UserMergeBranchResponse struct {
 func (m *UserMergeBranchResponse) Reset()                    { *m = UserMergeBranchResponse{} }
 func (m *UserMergeBranchResponse) String() string            { return proto.CompactTextString(m) }
 func (*UserMergeBranchResponse) ProtoMessage()               {}
-func (*UserMergeBranchResponse) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{9} }
+func (*UserMergeBranchResponse) Descriptor() ([]byte, []int) { return fileDescriptor7, []int{9} }
 
 func (m *UserMergeBranchResponse) GetCommitId() string {
 	if m != nil {
@@ -358,7 +358,7 @@ type OperationBranchUpdate struct {
 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 (*OperationBranchUpdate) Descriptor() ([]byte, []int) { return fileDescriptor7, []int{10} }
 
 func (m *OperationBranchUpdate) GetCommitId() string {
 	if m != nil {
@@ -391,7 +391,7 @@ type UserFFBranchRequest struct {
 func (m *UserFFBranchRequest) Reset()                    { *m = UserFFBranchRequest{} }
 func (m *UserFFBranchRequest) String() string            { return proto.CompactTextString(m) }
 func (*UserFFBranchRequest) ProtoMessage()               {}
-func (*UserFFBranchRequest) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{11} }
+func (*UserFFBranchRequest) Descriptor() ([]byte, []int) { return fileDescriptor7, []int{11} }
 
 func (m *UserFFBranchRequest) GetRepository() *Repository {
 	if m != nil {
@@ -429,7 +429,7 @@ type UserFFBranchResponse struct {
 func (m *UserFFBranchResponse) Reset()                    { *m = UserFFBranchResponse{} }
 func (m *UserFFBranchResponse) String() string            { return proto.CompactTextString(m) }
 func (*UserFFBranchResponse) ProtoMessage()               {}
-func (*UserFFBranchResponse) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{12} }
+func (*UserFFBranchResponse) Descriptor() ([]byte, []int) { return fileDescriptor7, []int{12} }
 
 func (m *UserFFBranchResponse) GetBranchUpdate() *OperationBranchUpdate {
 	if m != nil {
@@ -458,7 +458,7 @@ type UserCherryPickRequest struct {
 func (m *UserCherryPickRequest) Reset()                    { *m = UserCherryPickRequest{} }
 func (m *UserCherryPickRequest) String() string            { return proto.CompactTextString(m) }
 func (*UserCherryPickRequest) ProtoMessage()               {}
-func (*UserCherryPickRequest) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{13} }
+func (*UserCherryPickRequest) Descriptor() ([]byte, []int) { return fileDescriptor7, []int{13} }
 
 func (m *UserCherryPickRequest) GetRepository() *Repository {
 	if m != nil {
@@ -519,7 +519,7 @@ type UserCherryPickResponse struct {
 func (m *UserCherryPickResponse) Reset()                    { *m = UserCherryPickResponse{} }
 func (m *UserCherryPickResponse) String() string            { return proto.CompactTextString(m) }
 func (*UserCherryPickResponse) ProtoMessage()               {}
-func (*UserCherryPickResponse) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{14} }
+func (*UserCherryPickResponse) Descriptor() ([]byte, []int) { return fileDescriptor7, []int{14} }
 
 func (m *UserCherryPickResponse) GetBranchUpdate() *OperationBranchUpdate {
 	if m != nil {
@@ -562,7 +562,7 @@ type UserRevertRequest struct {
 func (m *UserRevertRequest) Reset()                    { *m = UserRevertRequest{} }
 func (m *UserRevertRequest) String() string            { return proto.CompactTextString(m) }
 func (*UserRevertRequest) ProtoMessage()               {}
-func (*UserRevertRequest) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{15} }
+func (*UserRevertRequest) Descriptor() ([]byte, []int) { return fileDescriptor7, []int{15} }
 
 func (m *UserRevertRequest) GetRepository() *Repository {
 	if m != nil {
@@ -623,7 +623,7 @@ type UserRevertResponse struct {
 func (m *UserRevertResponse) Reset()                    { *m = UserRevertResponse{} }
 func (m *UserRevertResponse) String() string            { return proto.CompactTextString(m) }
 func (*UserRevertResponse) ProtoMessage()               {}
-func (*UserRevertResponse) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{16} }
+func (*UserRevertResponse) Descriptor() ([]byte, []int) { return fileDescriptor7, []int{16} }
 
 func (m *UserRevertResponse) GetBranchUpdate() *OperationBranchUpdate {
 	if m != nil {
@@ -1009,9 +1009,9 @@ var _OperationService_serviceDesc = grpc.ServiceDesc{
 	Metadata: "operations.proto",
 }
 
-func init() { proto.RegisterFile("operations.proto", fileDescriptor6) }
+func init() { proto.RegisterFile("operations.proto", fileDescriptor7) }
 
-var fileDescriptor6 = []byte{
+var fileDescriptor7 = []byte{
 	// 867 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x57, 0xcd, 0x72, 0xd3, 0x48,
 	0x10, 0x8e, 0x6c, 0xc7, 0x71, 0xda, 0x8e, 0x7f, 0x66, 0x93, 0xac, 0xa2, 0xfc, 0x79, 0x55, 0xb5,
diff --git a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/ref.pb.go b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/ref.pb.go
index 2aae739c2..b26c1a814 100644
--- a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/ref.pb.go
+++ b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/ref.pb.go
@@ -41,7 +41,7 @@ func (x FindLocalBranchesRequest_SortBy) String() string {
 	return proto.EnumName(FindLocalBranchesRequest_SortBy_name, int32(x))
 }
 func (FindLocalBranchesRequest_SortBy) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor7, []int{8, 0}
+	return fileDescriptor8, []int{8, 0}
 }
 
 type CreateBranchResponse_Status int32
@@ -70,7 +70,7 @@ func (x CreateBranchResponse_Status) String() string {
 	return proto.EnumName(CreateBranchResponse_Status_name, int32(x))
 }
 func (CreateBranchResponse_Status) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor7, []int{19, 0}
+	return fileDescriptor8, []int{19, 0}
 }
 
 type FindDefaultBranchNameRequest struct {
@@ -80,7 +80,7 @@ type FindDefaultBranchNameRequest struct {
 func (m *FindDefaultBranchNameRequest) Reset()                    { *m = FindDefaultBranchNameRequest{} }
 func (m *FindDefaultBranchNameRequest) String() string            { return proto.CompactTextString(m) }
 func (*FindDefaultBranchNameRequest) ProtoMessage()               {}
-func (*FindDefaultBranchNameRequest) Descriptor() ([]byte, []int) { return fileDescriptor7, []int{0} }
+func (*FindDefaultBranchNameRequest) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{0} }
 
 func (m *FindDefaultBranchNameRequest) GetRepository() *Repository {
 	if m != nil {
@@ -96,7 +96,7 @@ type FindDefaultBranchNameResponse struct {
 func (m *FindDefaultBranchNameResponse) Reset()                    { *m = FindDefaultBranchNameResponse{} }
 func (m *FindDefaultBranchNameResponse) String() string            { return proto.CompactTextString(m) }
 func (*FindDefaultBranchNameResponse) ProtoMessage()               {}
-func (*FindDefaultBranchNameResponse) Descriptor() ([]byte, []int) { return fileDescriptor7, []int{1} }
+func (*FindDefaultBranchNameResponse) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{1} }
 
 func (m *FindDefaultBranchNameResponse) GetName() []byte {
 	if m != nil {
@@ -112,7 +112,7 @@ type FindAllBranchNamesRequest struct {
 func (m *FindAllBranchNamesRequest) Reset()                    { *m = FindAllBranchNamesRequest{} }
 func (m *FindAllBranchNamesRequest) String() string            { return proto.CompactTextString(m) }
 func (*FindAllBranchNamesRequest) ProtoMessage()               {}
-func (*FindAllBranchNamesRequest) Descriptor() ([]byte, []int) { return fileDescriptor7, []int{2} }
+func (*FindAllBranchNamesRequest) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{2} }
 
 func (m *FindAllBranchNamesRequest) GetRepository() *Repository {
 	if m != nil {
@@ -128,7 +128,7 @@ type FindAllBranchNamesResponse struct {
 func (m *FindAllBranchNamesResponse) Reset()                    { *m = FindAllBranchNamesResponse{} }
 func (m *FindAllBranchNamesResponse) String() string            { return proto.CompactTextString(m) }
 func (*FindAllBranchNamesResponse) ProtoMessage()               {}
-func (*FindAllBranchNamesResponse) Descriptor() ([]byte, []int) { return fileDescriptor7, []int{3} }
+func (*FindAllBranchNamesResponse) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{3} }
 
 func (m *FindAllBranchNamesResponse) GetNames() [][]byte {
 	if m != nil {
@@ -144,7 +144,7 @@ type FindAllTagNamesRequest struct {
 func (m *FindAllTagNamesRequest) Reset()                    { *m = FindAllTagNamesRequest{} }
 func (m *FindAllTagNamesRequest) String() string            { return proto.CompactTextString(m) }
 func (*FindAllTagNamesRequest) ProtoMessage()               {}
-func (*FindAllTagNamesRequest) Descriptor() ([]byte, []int) { return fileDescriptor7, []int{4} }
+func (*FindAllTagNamesRequest) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{4} }
 
 func (m *FindAllTagNamesRequest) GetRepository() *Repository {
 	if m != nil {
@@ -160,7 +160,7 @@ type FindAllTagNamesResponse struct {
 func (m *FindAllTagNamesResponse) Reset()                    { *m = FindAllTagNamesResponse{} }
 func (m *FindAllTagNamesResponse) String() string            { return proto.CompactTextString(m) }
 func (*FindAllTagNamesResponse) ProtoMessage()               {}
-func (*FindAllTagNamesResponse) Descriptor() ([]byte, []int) { return fileDescriptor7, []int{5} }
+func (*FindAllTagNamesResponse) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{5} }
 
 func (m *FindAllTagNamesResponse) GetNames() [][]byte {
 	if m != nil {
@@ -180,7 +180,7 @@ type FindRefNameRequest struct {
 func (m *FindRefNameRequest) Reset()                    { *m = FindRefNameRequest{} }
 func (m *FindRefNameRequest) String() string            { return proto.CompactTextString(m) }
 func (*FindRefNameRequest) ProtoMessage()               {}
-func (*FindRefNameRequest) Descriptor() ([]byte, []int) { return fileDescriptor7, []int{6} }
+func (*FindRefNameRequest) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{6} }
 
 func (m *FindRefNameRequest) GetRepository() *Repository {
 	if m != nil {
@@ -211,7 +211,7 @@ type FindRefNameResponse struct {
 func (m *FindRefNameResponse) Reset()                    { *m = FindRefNameResponse{} }
 func (m *FindRefNameResponse) String() string            { return proto.CompactTextString(m) }
 func (*FindRefNameResponse) ProtoMessage()               {}
-func (*FindRefNameResponse) Descriptor() ([]byte, []int) { return fileDescriptor7, []int{7} }
+func (*FindRefNameResponse) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{7} }
 
 func (m *FindRefNameResponse) GetName() []byte {
 	if m != nil {
@@ -228,7 +228,7 @@ type FindLocalBranchesRequest struct {
 func (m *FindLocalBranchesRequest) Reset()                    { *m = FindLocalBranchesRequest{} }
 func (m *FindLocalBranchesRequest) String() string            { return proto.CompactTextString(m) }
 func (*FindLocalBranchesRequest) ProtoMessage()               {}
-func (*FindLocalBranchesRequest) Descriptor() ([]byte, []int) { return fileDescriptor7, []int{8} }
+func (*FindLocalBranchesRequest) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{8} }
 
 func (m *FindLocalBranchesRequest) GetRepository() *Repository {
 	if m != nil {
@@ -251,7 +251,7 @@ type FindLocalBranchesResponse struct {
 func (m *FindLocalBranchesResponse) Reset()                    { *m = FindLocalBranchesResponse{} }
 func (m *FindLocalBranchesResponse) String() string            { return proto.CompactTextString(m) }
 func (*FindLocalBranchesResponse) ProtoMessage()               {}
-func (*FindLocalBranchesResponse) Descriptor() ([]byte, []int) { return fileDescriptor7, []int{9} }
+func (*FindLocalBranchesResponse) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{9} }
 
 func (m *FindLocalBranchesResponse) GetBranches() []*FindLocalBranchResponse {
 	if m != nil {
@@ -271,7 +271,7 @@ type FindLocalBranchResponse struct {
 func (m *FindLocalBranchResponse) Reset()                    { *m = FindLocalBranchResponse{} }
 func (m *FindLocalBranchResponse) String() string            { return proto.CompactTextString(m) }
 func (*FindLocalBranchResponse) ProtoMessage()               {}
-func (*FindLocalBranchResponse) Descriptor() ([]byte, []int) { return fileDescriptor7, []int{10} }
+func (*FindLocalBranchResponse) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{10} }
 
 func (m *FindLocalBranchResponse) GetName() []byte {
 	if m != nil {
@@ -317,7 +317,7 @@ type FindLocalBranchCommitAuthor struct {
 func (m *FindLocalBranchCommitAuthor) Reset()                    { *m = FindLocalBranchCommitAuthor{} }
 func (m *FindLocalBranchCommitAuthor) String() string            { return proto.CompactTextString(m) }
 func (*FindLocalBranchCommitAuthor) ProtoMessage()               {}
-func (*FindLocalBranchCommitAuthor) Descriptor() ([]byte, []int) { return fileDescriptor7, []int{11} }
+func (*FindLocalBranchCommitAuthor) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{11} }
 
 func (m *FindLocalBranchCommitAuthor) GetName() []byte {
 	if m != nil {
@@ -347,7 +347,7 @@ type FindAllBranchesRequest struct {
 func (m *FindAllBranchesRequest) Reset()                    { *m = FindAllBranchesRequest{} }
 func (m *FindAllBranchesRequest) String() string            { return proto.CompactTextString(m) }
 func (*FindAllBranchesRequest) ProtoMessage()               {}
-func (*FindAllBranchesRequest) Descriptor() ([]byte, []int) { return fileDescriptor7, []int{12} }
+func (*FindAllBranchesRequest) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{12} }
 
 func (m *FindAllBranchesRequest) GetRepository() *Repository {
 	if m != nil {
@@ -363,7 +363,7 @@ type FindAllBranchesResponse struct {
 func (m *FindAllBranchesResponse) Reset()                    { *m = FindAllBranchesResponse{} }
 func (m *FindAllBranchesResponse) String() string            { return proto.CompactTextString(m) }
 func (*FindAllBranchesResponse) ProtoMessage()               {}
-func (*FindAllBranchesResponse) Descriptor() ([]byte, []int) { return fileDescriptor7, []int{13} }
+func (*FindAllBranchesResponse) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{13} }
 
 func (m *FindAllBranchesResponse) GetBranches() []*FindAllBranchesResponse_Branch {
 	if m != nil {
@@ -381,7 +381,7 @@ func (m *FindAllBranchesResponse_Branch) Reset()         { *m = FindAllBranchesR
 func (m *FindAllBranchesResponse_Branch) String() string { return proto.CompactTextString(m) }
 func (*FindAllBranchesResponse_Branch) ProtoMessage()    {}
 func (*FindAllBranchesResponse_Branch) Descriptor() ([]byte, []int) {
-	return fileDescriptor7, []int{13, 0}
+	return fileDescriptor8, []int{13, 0}
 }
 
 func (m *FindAllBranchesResponse_Branch) GetName() []byte {
@@ -405,7 +405,7 @@ type FindAllTagsRequest struct {
 func (m *FindAllTagsRequest) Reset()                    { *m = FindAllTagsRequest{} }
 func (m *FindAllTagsRequest) String() string            { return proto.CompactTextString(m) }
 func (*FindAllTagsRequest) ProtoMessage()               {}
-func (*FindAllTagsRequest) Descriptor() ([]byte, []int) { return fileDescriptor7, []int{14} }
+func (*FindAllTagsRequest) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{14} }
 
 func (m *FindAllTagsRequest) GetRepository() *Repository {
 	if m != nil {
@@ -421,7 +421,7 @@ type FindAllTagsResponse struct {
 func (m *FindAllTagsResponse) Reset()                    { *m = FindAllTagsResponse{} }
 func (m *FindAllTagsResponse) String() string            { return proto.CompactTextString(m) }
 func (*FindAllTagsResponse) ProtoMessage()               {}
-func (*FindAllTagsResponse) Descriptor() ([]byte, []int) { return fileDescriptor7, []int{15} }
+func (*FindAllTagsResponse) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{15} }
 
 func (m *FindAllTagsResponse) GetTags() []*Tag {
 	if m != nil {
@@ -439,7 +439,7 @@ type RefExistsRequest struct {
 func (m *RefExistsRequest) Reset()                    { *m = RefExistsRequest{} }
 func (m *RefExistsRequest) String() string            { return proto.CompactTextString(m) }
 func (*RefExistsRequest) ProtoMessage()               {}
-func (*RefExistsRequest) Descriptor() ([]byte, []int) { return fileDescriptor7, []int{16} }
+func (*RefExistsRequest) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{16} }
 
 func (m *RefExistsRequest) GetRepository() *Repository {
 	if m != nil {
@@ -462,7 +462,7 @@ type RefExistsResponse struct {
 func (m *RefExistsResponse) Reset()                    { *m = RefExistsResponse{} }
 func (m *RefExistsResponse) String() string            { return proto.CompactTextString(m) }
 func (*RefExistsResponse) ProtoMessage()               {}
-func (*RefExistsResponse) Descriptor() ([]byte, []int) { return fileDescriptor7, []int{17} }
+func (*RefExistsResponse) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{17} }
 
 func (m *RefExistsResponse) GetValue() bool {
 	if m != nil {
@@ -480,7 +480,7 @@ type CreateBranchRequest struct {
 func (m *CreateBranchRequest) Reset()                    { *m = CreateBranchRequest{} }
 func (m *CreateBranchRequest) String() string            { return proto.CompactTextString(m) }
 func (*CreateBranchRequest) ProtoMessage()               {}
-func (*CreateBranchRequest) Descriptor() ([]byte, []int) { return fileDescriptor7, []int{18} }
+func (*CreateBranchRequest) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{18} }
 
 func (m *CreateBranchRequest) GetRepository() *Repository {
 	if m != nil {
@@ -511,7 +511,7 @@ type CreateBranchResponse struct {
 func (m *CreateBranchResponse) Reset()                    { *m = CreateBranchResponse{} }
 func (m *CreateBranchResponse) String() string            { return proto.CompactTextString(m) }
 func (*CreateBranchResponse) ProtoMessage()               {}
-func (*CreateBranchResponse) Descriptor() ([]byte, []int) { return fileDescriptor7, []int{19} }
+func (*CreateBranchResponse) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{19} }
 
 func (m *CreateBranchResponse) GetStatus() CreateBranchResponse_Status {
 	if m != nil {
@@ -535,7 +535,7 @@ type DeleteBranchRequest struct {
 func (m *DeleteBranchRequest) Reset()                    { *m = DeleteBranchRequest{} }
 func (m *DeleteBranchRequest) String() string            { return proto.CompactTextString(m) }
 func (*DeleteBranchRequest) ProtoMessage()               {}
-func (*DeleteBranchRequest) Descriptor() ([]byte, []int) { return fileDescriptor7, []int{20} }
+func (*DeleteBranchRequest) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{20} }
 
 func (m *DeleteBranchRequest) GetRepository() *Repository {
 	if m != nil {
@@ -558,7 +558,7 @@ type DeleteBranchResponse struct {
 func (m *DeleteBranchResponse) Reset()                    { *m = DeleteBranchResponse{} }
 func (m *DeleteBranchResponse) String() string            { return proto.CompactTextString(m) }
 func (*DeleteBranchResponse) ProtoMessage()               {}
-func (*DeleteBranchResponse) Descriptor() ([]byte, []int) { return fileDescriptor7, []int{21} }
+func (*DeleteBranchResponse) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{21} }
 
 type FindBranchRequest struct {
 	Repository *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"`
@@ -569,7 +569,7 @@ type FindBranchRequest struct {
 func (m *FindBranchRequest) Reset()                    { *m = FindBranchRequest{} }
 func (m *FindBranchRequest) String() string            { return proto.CompactTextString(m) }
 func (*FindBranchRequest) ProtoMessage()               {}
-func (*FindBranchRequest) Descriptor() ([]byte, []int) { return fileDescriptor7, []int{22} }
+func (*FindBranchRequest) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{22} }
 
 func (m *FindBranchRequest) GetRepository() *Repository {
 	if m != nil {
@@ -592,7 +592,7 @@ type FindBranchResponse struct {
 func (m *FindBranchResponse) Reset()                    { *m = FindBranchResponse{} }
 func (m *FindBranchResponse) String() string            { return proto.CompactTextString(m) }
 func (*FindBranchResponse) ProtoMessage()               {}
-func (*FindBranchResponse) Descriptor() ([]byte, []int) { return fileDescriptor7, []int{23} }
+func (*FindBranchResponse) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{23} }
 
 func (m *FindBranchResponse) GetBranch() *Branch {
 	if m != nil {
@@ -609,7 +609,7 @@ type DeleteRefsRequest struct {
 func (m *DeleteRefsRequest) Reset()                    { *m = DeleteRefsRequest{} }
 func (m *DeleteRefsRequest) String() string            { return proto.CompactTextString(m) }
 func (*DeleteRefsRequest) ProtoMessage()               {}
-func (*DeleteRefsRequest) Descriptor() ([]byte, []int) { return fileDescriptor7, []int{24} }
+func (*DeleteRefsRequest) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{24} }
 
 func (m *DeleteRefsRequest) GetRepository() *Repository {
 	if m != nil {
@@ -631,7 +631,7 @@ type DeleteRefsResponse struct {
 func (m *DeleteRefsResponse) Reset()                    { *m = DeleteRefsResponse{} }
 func (m *DeleteRefsResponse) String() string            { return proto.CompactTextString(m) }
 func (*DeleteRefsResponse) ProtoMessage()               {}
-func (*DeleteRefsResponse) Descriptor() ([]byte, []int) { return fileDescriptor7, []int{25} }
+func (*DeleteRefsResponse) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{25} }
 
 func init() {
 	proto.RegisterType((*FindDefaultBranchNameRequest)(nil), "gitaly.FindDefaultBranchNameRequest")
@@ -1240,9 +1240,9 @@ var _RefService_serviceDesc = grpc.ServiceDesc{
 	Metadata: "ref.proto",
 }
 
-func init() { proto.RegisterFile("ref.proto", fileDescriptor7) }
+func init() { proto.RegisterFile("ref.proto", fileDescriptor8) }
 
-var fileDescriptor7 = []byte{
+var fileDescriptor8 = []byte{
 	// 1064 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xdd, 0x72, 0x22, 0x45,
 	0x14, 0xce, 0x90, 0x64, 0x36, 0x39, 0x60, 0x32, 0xe9, 0x60, 0x96, 0x0c, 0xeb, 0x92, 0x6d, 0xdd,
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 14916546e..d936ba10d 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
@@ -42,7 +42,7 @@ var GetArchiveRequest_Format_value = map[string]int32{
 func (x GetArchiveRequest_Format) String() string {
 	return proto.EnumName(GetArchiveRequest_Format_name, int32(x))
 }
-func (GetArchiveRequest_Format) EnumDescriptor() ([]byte, []int) { return fileDescriptor8, []int{18, 0} }
+func (GetArchiveRequest_Format) EnumDescriptor() ([]byte, []int) { return fileDescriptor9, []int{18, 0} }
 
 type RepositoryExistsRequest struct {
 	Repository *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"`
@@ -51,7 +51,7 @@ type RepositoryExistsRequest struct {
 func (m *RepositoryExistsRequest) Reset()                    { *m = RepositoryExistsRequest{} }
 func (m *RepositoryExistsRequest) String() string            { return proto.CompactTextString(m) }
 func (*RepositoryExistsRequest) ProtoMessage()               {}
-func (*RepositoryExistsRequest) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{0} }
+func (*RepositoryExistsRequest) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{0} }
 
 func (m *RepositoryExistsRequest) GetRepository() *Repository {
 	if m != nil {
@@ -67,7 +67,7 @@ type RepositoryExistsResponse struct {
 func (m *RepositoryExistsResponse) Reset()                    { *m = RepositoryExistsResponse{} }
 func (m *RepositoryExistsResponse) String() string            { return proto.CompactTextString(m) }
 func (*RepositoryExistsResponse) ProtoMessage()               {}
-func (*RepositoryExistsResponse) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{1} }
+func (*RepositoryExistsResponse) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{1} }
 
 func (m *RepositoryExistsResponse) GetExists() bool {
 	if m != nil {
@@ -83,7 +83,7 @@ type RepositoryIsEmptyRequest struct {
 func (m *RepositoryIsEmptyRequest) Reset()                    { *m = RepositoryIsEmptyRequest{} }
 func (m *RepositoryIsEmptyRequest) String() string            { return proto.CompactTextString(m) }
 func (*RepositoryIsEmptyRequest) ProtoMessage()               {}
-func (*RepositoryIsEmptyRequest) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{2} }
+func (*RepositoryIsEmptyRequest) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{2} }
 
 func (m *RepositoryIsEmptyRequest) GetRepository() *Repository {
 	if m != nil {
@@ -99,7 +99,7 @@ type RepositoryIsEmptyResponse struct {
 func (m *RepositoryIsEmptyResponse) Reset()                    { *m = RepositoryIsEmptyResponse{} }
 func (m *RepositoryIsEmptyResponse) String() string            { return proto.CompactTextString(m) }
 func (*RepositoryIsEmptyResponse) ProtoMessage()               {}
-func (*RepositoryIsEmptyResponse) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{3} }
+func (*RepositoryIsEmptyResponse) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{3} }
 
 func (m *RepositoryIsEmptyResponse) GetIsEmpty() bool {
 	if m != nil {
@@ -115,7 +115,7 @@ type RepackIncrementalRequest struct {
 func (m *RepackIncrementalRequest) Reset()                    { *m = RepackIncrementalRequest{} }
 func (m *RepackIncrementalRequest) String() string            { return proto.CompactTextString(m) }
 func (*RepackIncrementalRequest) ProtoMessage()               {}
-func (*RepackIncrementalRequest) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{4} }
+func (*RepackIncrementalRequest) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{4} }
 
 func (m *RepackIncrementalRequest) GetRepository() *Repository {
 	if m != nil {
@@ -130,7 +130,7 @@ type RepackIncrementalResponse struct {
 func (m *RepackIncrementalResponse) Reset()                    { *m = RepackIncrementalResponse{} }
 func (m *RepackIncrementalResponse) String() string            { return proto.CompactTextString(m) }
 func (*RepackIncrementalResponse) ProtoMessage()               {}
-func (*RepackIncrementalResponse) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{5} }
+func (*RepackIncrementalResponse) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{5} }
 
 type RepackFullRequest struct {
 	Repository   *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"`
@@ -140,7 +140,7 @@ type RepackFullRequest struct {
 func (m *RepackFullRequest) Reset()                    { *m = RepackFullRequest{} }
 func (m *RepackFullRequest) String() string            { return proto.CompactTextString(m) }
 func (*RepackFullRequest) ProtoMessage()               {}
-func (*RepackFullRequest) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{6} }
+func (*RepackFullRequest) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{6} }
 
 func (m *RepackFullRequest) GetRepository() *Repository {
 	if m != nil {
@@ -162,7 +162,7 @@ type RepackFullResponse struct {
 func (m *RepackFullResponse) Reset()                    { *m = RepackFullResponse{} }
 func (m *RepackFullResponse) String() string            { return proto.CompactTextString(m) }
 func (*RepackFullResponse) ProtoMessage()               {}
-func (*RepackFullResponse) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{7} }
+func (*RepackFullResponse) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{7} }
 
 type GarbageCollectRequest struct {
 	Repository   *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"`
@@ -172,7 +172,7 @@ type GarbageCollectRequest struct {
 func (m *GarbageCollectRequest) Reset()                    { *m = GarbageCollectRequest{} }
 func (m *GarbageCollectRequest) String() string            { return proto.CompactTextString(m) }
 func (*GarbageCollectRequest) ProtoMessage()               {}
-func (*GarbageCollectRequest) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{8} }
+func (*GarbageCollectRequest) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{8} }
 
 func (m *GarbageCollectRequest) GetRepository() *Repository {
 	if m != nil {
@@ -194,7 +194,7 @@ type GarbageCollectResponse struct {
 func (m *GarbageCollectResponse) Reset()                    { *m = GarbageCollectResponse{} }
 func (m *GarbageCollectResponse) String() string            { return proto.CompactTextString(m) }
 func (*GarbageCollectResponse) ProtoMessage()               {}
-func (*GarbageCollectResponse) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{9} }
+func (*GarbageCollectResponse) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{9} }
 
 type RepositorySizeRequest struct {
 	Repository *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"`
@@ -203,7 +203,7 @@ type RepositorySizeRequest struct {
 func (m *RepositorySizeRequest) Reset()                    { *m = RepositorySizeRequest{} }
 func (m *RepositorySizeRequest) String() string            { return proto.CompactTextString(m) }
 func (*RepositorySizeRequest) ProtoMessage()               {}
-func (*RepositorySizeRequest) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{10} }
+func (*RepositorySizeRequest) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{10} }
 
 func (m *RepositorySizeRequest) GetRepository() *Repository {
 	if m != nil {
@@ -220,7 +220,7 @@ type RepositorySizeResponse struct {
 func (m *RepositorySizeResponse) Reset()                    { *m = RepositorySizeResponse{} }
 func (m *RepositorySizeResponse) String() string            { return proto.CompactTextString(m) }
 func (*RepositorySizeResponse) ProtoMessage()               {}
-func (*RepositorySizeResponse) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{11} }
+func (*RepositorySizeResponse) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{11} }
 
 func (m *RepositorySizeResponse) GetSize() int64 {
 	if m != nil {
@@ -237,7 +237,7 @@ type ApplyGitattributesRequest struct {
 func (m *ApplyGitattributesRequest) Reset()                    { *m = ApplyGitattributesRequest{} }
 func (m *ApplyGitattributesRequest) String() string            { return proto.CompactTextString(m) }
 func (*ApplyGitattributesRequest) ProtoMessage()               {}
-func (*ApplyGitattributesRequest) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{12} }
+func (*ApplyGitattributesRequest) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{12} }
 
 func (m *ApplyGitattributesRequest) GetRepository() *Repository {
 	if m != nil {
@@ -259,7 +259,7 @@ type ApplyGitattributesResponse struct {
 func (m *ApplyGitattributesResponse) Reset()                    { *m = ApplyGitattributesResponse{} }
 func (m *ApplyGitattributesResponse) String() string            { return proto.CompactTextString(m) }
 func (*ApplyGitattributesResponse) ProtoMessage()               {}
-func (*ApplyGitattributesResponse) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{13} }
+func (*ApplyGitattributesResponse) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{13} }
 
 type FetchRemoteRequest struct {
 	Repository *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"`
@@ -274,7 +274,7 @@ type FetchRemoteRequest struct {
 func (m *FetchRemoteRequest) Reset()                    { *m = FetchRemoteRequest{} }
 func (m *FetchRemoteRequest) String() string            { return proto.CompactTextString(m) }
 func (*FetchRemoteRequest) ProtoMessage()               {}
-func (*FetchRemoteRequest) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{14} }
+func (*FetchRemoteRequest) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{14} }
 
 func (m *FetchRemoteRequest) GetRepository() *Repository {
 	if m != nil {
@@ -331,7 +331,7 @@ type FetchRemoteResponse struct {
 func (m *FetchRemoteResponse) Reset()                    { *m = FetchRemoteResponse{} }
 func (m *FetchRemoteResponse) String() string            { return proto.CompactTextString(m) }
 func (*FetchRemoteResponse) ProtoMessage()               {}
-func (*FetchRemoteResponse) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{15} }
+func (*FetchRemoteResponse) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{15} }
 
 type CreateRepositoryRequest struct {
 	Repository *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"`
@@ -340,7 +340,7 @@ type CreateRepositoryRequest struct {
 func (m *CreateRepositoryRequest) Reset()                    { *m = CreateRepositoryRequest{} }
 func (m *CreateRepositoryRequest) String() string            { return proto.CompactTextString(m) }
 func (*CreateRepositoryRequest) ProtoMessage()               {}
-func (*CreateRepositoryRequest) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{16} }
+func (*CreateRepositoryRequest) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{16} }
 
 func (m *CreateRepositoryRequest) GetRepository() *Repository {
 	if m != nil {
@@ -355,7 +355,7 @@ type CreateRepositoryResponse struct {
 func (m *CreateRepositoryResponse) Reset()                    { *m = CreateRepositoryResponse{} }
 func (m *CreateRepositoryResponse) String() string            { return proto.CompactTextString(m) }
 func (*CreateRepositoryResponse) ProtoMessage()               {}
-func (*CreateRepositoryResponse) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{17} }
+func (*CreateRepositoryResponse) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{17} }
 
 type GetArchiveRequest struct {
 	Repository *Repository              `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"`
@@ -367,7 +367,7 @@ type GetArchiveRequest struct {
 func (m *GetArchiveRequest) Reset()                    { *m = GetArchiveRequest{} }
 func (m *GetArchiveRequest) String() string            { return proto.CompactTextString(m) }
 func (*GetArchiveRequest) ProtoMessage()               {}
-func (*GetArchiveRequest) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{18} }
+func (*GetArchiveRequest) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{18} }
 
 func (m *GetArchiveRequest) GetRepository() *Repository {
 	if m != nil {
@@ -404,7 +404,7 @@ type GetArchiveResponse struct {
 func (m *GetArchiveResponse) Reset()                    { *m = GetArchiveResponse{} }
 func (m *GetArchiveResponse) String() string            { return proto.CompactTextString(m) }
 func (*GetArchiveResponse) ProtoMessage()               {}
-func (*GetArchiveResponse) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{19} }
+func (*GetArchiveResponse) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{19} }
 
 func (m *GetArchiveResponse) GetData() []byte {
 	if m != nil {
@@ -420,7 +420,7 @@ type HasLocalBranchesRequest struct {
 func (m *HasLocalBranchesRequest) Reset()                    { *m = HasLocalBranchesRequest{} }
 func (m *HasLocalBranchesRequest) String() string            { return proto.CompactTextString(m) }
 func (*HasLocalBranchesRequest) ProtoMessage()               {}
-func (*HasLocalBranchesRequest) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{20} }
+func (*HasLocalBranchesRequest) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{20} }
 
 func (m *HasLocalBranchesRequest) GetRepository() *Repository {
 	if m != nil {
@@ -436,7 +436,7 @@ type HasLocalBranchesResponse struct {
 func (m *HasLocalBranchesResponse) Reset()                    { *m = HasLocalBranchesResponse{} }
 func (m *HasLocalBranchesResponse) String() string            { return proto.CompactTextString(m) }
 func (*HasLocalBranchesResponse) ProtoMessage()               {}
-func (*HasLocalBranchesResponse) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{21} }
+func (*HasLocalBranchesResponse) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{21} }
 
 func (m *HasLocalBranchesResponse) GetValue() bool {
 	if m != nil {
@@ -453,7 +453,7 @@ type ChangeStorageRequest struct {
 func (m *ChangeStorageRequest) Reset()                    { *m = ChangeStorageRequest{} }
 func (m *ChangeStorageRequest) String() string            { return proto.CompactTextString(m) }
 func (*ChangeStorageRequest) ProtoMessage()               {}
-func (*ChangeStorageRequest) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{22} }
+func (*ChangeStorageRequest) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{22} }
 
 func (m *ChangeStorageRequest) GetRepository() *Repository {
 	if m != nil {
@@ -475,7 +475,7 @@ type ChangeStorageResponse struct {
 func (m *ChangeStorageResponse) Reset()                    { *m = ChangeStorageResponse{} }
 func (m *ChangeStorageResponse) String() string            { return proto.CompactTextString(m) }
 func (*ChangeStorageResponse) ProtoMessage()               {}
-func (*ChangeStorageResponse) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{23} }
+func (*ChangeStorageResponse) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{23} }
 
 type FetchSourceBranchRequest struct {
 	Repository       *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"`
@@ -487,7 +487,7 @@ type FetchSourceBranchRequest struct {
 func (m *FetchSourceBranchRequest) Reset()                    { *m = FetchSourceBranchRequest{} }
 func (m *FetchSourceBranchRequest) String() string            { return proto.CompactTextString(m) }
 func (*FetchSourceBranchRequest) ProtoMessage()               {}
-func (*FetchSourceBranchRequest) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{24} }
+func (*FetchSourceBranchRequest) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{24} }
 
 func (m *FetchSourceBranchRequest) GetRepository() *Repository {
 	if m != nil {
@@ -524,7 +524,7 @@ type FetchSourceBranchResponse struct {
 func (m *FetchSourceBranchResponse) Reset()                    { *m = FetchSourceBranchResponse{} }
 func (m *FetchSourceBranchResponse) String() string            { return proto.CompactTextString(m) }
 func (*FetchSourceBranchResponse) ProtoMessage()               {}
-func (*FetchSourceBranchResponse) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{25} }
+func (*FetchSourceBranchResponse) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{25} }
 
 func (m *FetchSourceBranchResponse) GetResult() bool {
 	if m != nil {
@@ -540,7 +540,7 @@ type FsckRequest struct {
 func (m *FsckRequest) Reset()                    { *m = FsckRequest{} }
 func (m *FsckRequest) String() string            { return proto.CompactTextString(m) }
 func (*FsckRequest) ProtoMessage()               {}
-func (*FsckRequest) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{26} }
+func (*FsckRequest) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{26} }
 
 func (m *FsckRequest) GetRepository() *Repository {
 	if m != nil {
@@ -556,7 +556,7 @@ type FsckResponse struct {
 func (m *FsckResponse) Reset()                    { *m = FsckResponse{} }
 func (m *FsckResponse) String() string            { return proto.CompactTextString(m) }
 func (*FsckResponse) ProtoMessage()               {}
-func (*FsckResponse) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{27} }
+func (*FsckResponse) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{27} }
 
 func (m *FsckResponse) GetError() []byte {
 	if m != nil {
@@ -569,12 +569,13 @@ type WriteRefRequest struct {
 	Repository *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"`
 	Ref        []byte      `protobuf:"bytes,2,opt,name=ref,proto3" json:"ref,omitempty"`
 	Revision   []byte      `protobuf:"bytes,3,opt,name=revision,proto3" json:"revision,omitempty"`
+	Force      bool        `protobuf:"varint,4,opt,name=force" json:"force,omitempty"`
 }
 
 func (m *WriteRefRequest) Reset()                    { *m = WriteRefRequest{} }
 func (m *WriteRefRequest) String() string            { return proto.CompactTextString(m) }
 func (*WriteRefRequest) ProtoMessage()               {}
-func (*WriteRefRequest) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{28} }
+func (*WriteRefRequest) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{28} }
 
 func (m *WriteRefRequest) GetRepository() *Repository {
 	if m != nil {
@@ -597,6 +598,13 @@ func (m *WriteRefRequest) GetRevision() []byte {
 	return nil
 }
 
+func (m *WriteRefRequest) GetForce() bool {
+	if m != nil {
+		return m.Force
+	}
+	return false
+}
+
 type WriteRefResponse struct {
 	Error []byte `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"`
 }
@@ -604,7 +612,7 @@ type WriteRefResponse struct {
 func (m *WriteRefResponse) Reset()                    { *m = WriteRefResponse{} }
 func (m *WriteRefResponse) String() string            { return proto.CompactTextString(m) }
 func (*WriteRefResponse) ProtoMessage()               {}
-func (*WriteRefResponse) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{29} }
+func (*WriteRefResponse) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{29} }
 
 func (m *WriteRefResponse) GetError() []byte {
 	if m != nil {
@@ -1209,75 +1217,76 @@ var _RepositoryService_serviceDesc = grpc.ServiceDesc{
 	Metadata: "repository-service.proto",
 }
 
-func init() { proto.RegisterFile("repository-service.proto", fileDescriptor8) }
-
-var fileDescriptor8 = []byte{
-	// 1070 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, 0x70, 0xc8, 0xd2, 0x30, 0xcb, 0x8f, 0x31, 0x4b, 0x97, 0x4e, 0x7b, 0xc1,
-	0x45, 0x8b, 0x56, 0x41, 0xaa, 0x7a, 0xb7, 0x02, 0xc4, 0x9f, 0xb6, 0x8b, 0x5a, 0x83, 0x84, 0x84,
-	0x54, 0x59, 0x83, 0x99, 0x24, 0x16, 0x89, 0x27, 0x9d, 0x99, 0xc0, 0x66, 0x5f, 0xb3, 0x17, 0x7d,
-	0x80, 0x5e, 0xf6, 0x25, 0x2a, 0xcf, 0x4c, 0x3c, 0x76, 0x6c, 0x73, 0x63, 0xf5, 0xce, 0x73, 0xe6,
-	0xcc, 0x77, 0xbe, 0x39, 0x73, 0xfe, 0x0c, 0x0e, 0xa7, 0x63, 0x26, 0x42, 0xc9, 0xf8, 0xf4, 0x27,
-	0x41, 0xf9, 0x73, 0x18, 0xd0, 0xc3, 0x31, 0x67, 0x92, 0xa1, 0x66, 0x3f, 0x94, 0x64, 0x38, 0x75,
-	0xdb, 0x62, 0x40, 0x38, 0x7d, 0xd4, 0x52, 0xfc, 0x19, 0xb6, 0xbd, 0xe4, 0xc4, 0xd9, 0x97, 0x50,
-	0x48, 0xe1, 0xd1, 0x3f, 0x27, 0x54, 0x48, 0xd4, 0x05, 0xb0, 0x60, 0x4e, 0x7d, 0xbf, 0x7e, 0xb0,
-	0xda, 0x45, 0x87, 0x1a, 0xe5, 0xd0, 0x1e, 0xf2, 0x52, 0x5a, 0xb8, 0x0b, 0x4e, 0x1e, 0x4e, 0x8c,
-	0x59, 0x24, 0x28, 0xda, 0x82, 0x26, 0x55, 0x12, 0x85, 0xb5, 0xec, 0x99, 0x15, 0xbe, 0x4e, 0x9f,
-	0xb9, 0x12, 0x67, 0xa3, 0xb1, 0x9c, 0x56, 0xe1, 0xf0, 0x33, 0xec, 0x14, 0xe0, 0x19, 0x12, 0x3b,
-	0xb0, 0x1c, 0x0a, 0x9f, 0xc6, 0x32, 0x43, 0xa3, 0x15, 0x6a, 0x15, 0xc3, 0x83, 0x04, 0x4f, 0x57,
-	0x51, 0xc0, 0xe9, 0x88, 0x46, 0x92, 0x0c, 0xab, 0xf0, 0xd8, 0x55, 0x3c, 0xe6, 0xf1, 0x34, 0x0f,
-	0x3c, 0x84, 0x75, 0xbd, 0x79, 0x3e, 0x19, 0x56, 0xb1, 0x82, 0xbe, 0x87, 0x37, 0x01, 0xa7, 0x44,
-	0x52, 0xff, 0x21, 0x94, 0x23, 0x32, 0x76, 0x16, 0xd4, 0xad, 0xda, 0x5a, 0x78, 0xa2, 0x64, 0x78,
-	0x03, 0x50, 0xda, 0x9a, 0xe1, 0x30, 0x86, 0xcd, 0x0b, 0xc2, 0x1f, 0x48, 0x9f, 0x9e, 0xb2, 0xe1,
-	0x90, 0x06, 0xf2, 0x7f, 0xe7, 0xe1, 0xc0, 0xd6, 0xbc, 0x45, 0xc3, 0xe5, 0x13, 0x6c, 0x5a, 0xe0,
-	0x9b, 0xf0, 0x2b, 0xad, 0xe2, 0xf9, 0x1f, 0x61, 0x6b, 0x1e, 0xcc, 0x3c, 0x3f, 0x82, 0x45, 0x11,
-	0x7e, 0xa5, 0x0a, 0xa7, 0xe1, 0xa9, 0x6f, 0xfc, 0x04, 0x3b, 0xc7, 0xe3, 0xf1, 0x70, 0x7a, 0x11,
-	0x4a, 0x22, 0x25, 0x0f, 0x1f, 0x26, 0x92, 0x56, 0x49, 0x02, 0xe4, 0xc2, 0x32, 0xa7, 0xcf, 0xa1,
-	0x08, 0x59, 0xa4, 0xbc, 0xd0, 0xf6, 0x92, 0x35, 0x7e, 0x07, 0x6e, 0x91, 0x31, 0xe3, 0x85, 0x7f,
-	0xea, 0x80, 0xce, 0xa9, 0x0c, 0x06, 0x1e, 0x1d, 0x31, 0x59, 0xc5, 0x07, 0x71, 0xb6, 0x71, 0x05,
-	0xa2, 0x28, 0xac, 0x78, 0x66, 0x85, 0x36, 0x60, 0xa9, 0xc7, 0x78, 0x40, 0x9d, 0x86, 0x7a, 0x1f,
-	0xbd, 0x40, 0xdb, 0xd0, 0x8a, 0x98, 0x2f, 0x49, 0x5f, 0x38, 0x8b, 0x3a, 0x39, 0x23, 0x76, 0x4b,
-	0xfa, 0x02, 0x39, 0xd0, 0x92, 0xe1, 0x88, 0xb2, 0x89, 0x74, 0x96, 0xf6, 0xeb, 0x07, 0x4b, 0xde,
-	0x6c, 0x19, 0x1f, 0x11, 0x62, 0xe0, 0x3f, 0xd1, 0xa9, 0xd3, 0xd4, 0x16, 0x84, 0x18, 0x7c, 0xa2,
-	0x53, 0xf4, 0x1e, 0x56, 0x9f, 0x22, 0xf6, 0x12, 0xf9, 0x03, 0x16, 0x27, 0x7b, 0x4b, 0x6d, 0x82,
-	0x12, 0x5d, 0xc6, 0x12, 0xbc, 0x09, 0x6f, 0x33, 0x97, 0x34, 0x97, 0xff, 0x0c, 0xdb, 0xa7, 0x2a,
-	0x58, 0x52, 0x37, 0xaa, 0x10, 0x04, 0x2e, 0x38, 0x79, 0x38, 0x63, 0xea, 0xdf, 0x3a, 0xac, 0x5f,
-	0x50, 0x79, 0xcc, 0x83, 0x41, 0xf8, 0x5c, 0xc9, 0xcd, 0xbb, 0xb0, 0x12, 0xb0, 0xd1, 0x28, 0x94,
-	0x7e, 0xf8, 0x68, 0x3c, 0xbd, 0xac, 0x05, 0x57, 0x8f, 0xf1, 0x1b, 0x8c, 0x39, 0xed, 0x85, 0x5f,
-	0x94, 0xb3, 0x57, 0x3c, 0xb3, 0x42, 0xbf, 0x40, 0xb3, 0xc7, 0xf8, 0x88, 0x48, 0xe5, 0xec, 0xb5,
-	0xee, 0xfe, 0xcc, 0x48, 0x8e, 0xd3, 0xe1, 0xb9, 0xd2, 0xf3, 0x8c, 0x3e, 0x3e, 0x82, 0xa6, 0x96,
-	0xa0, 0x16, 0x34, 0xee, 0xaf, 0x7e, 0xeb, 0xd4, 0xe2, 0x8f, 0xdb, 0x63, 0xaf, 0x53, 0x47, 0x00,
-	0xcd, 0xdb, 0x63, 0xcf, 0xbf, 0xb8, 0xef, 0x2c, 0xa0, 0x55, 0x68, 0xc5, 0xdf, 0x27, 0xf7, 0xdd,
-	0x4e, 0x03, 0x1f, 0x00, 0x4a, 0x03, 0xdb, 0x54, 0x78, 0x24, 0x92, 0xa8, 0x7b, 0xb6, 0x3d, 0xf5,
-	0x1d, 0x3f, 0xc1, 0x25, 0x11, 0xbf, 0xb2, 0x80, 0x0c, 0x4f, 0x38, 0x89, 0x82, 0x41, 0xa5, 0x44,
-	0xc0, 0x1f, 0xc0, 0xc9, 0xc3, 0x19, 0xf3, 0x1b, 0xb0, 0xf4, 0x4c, 0x86, 0x13, 0x6a, 0xaa, 0xb0,
-	0x5e, 0x60, 0x09, 0x1b, 0xa7, 0x03, 0x12, 0xf5, 0xe9, 0x8d, 0x64, 0x9c, 0xf4, 0x2b, 0x3d, 0xcd,
-	0x01, 0x74, 0x22, 0xfa, 0xe2, 0x0b, 0x8d, 0xe4, 0x47, 0x64, 0x34, 0xcb, 0x85, 0xb5, 0x88, 0xbe,
-	0x18, 0x03, 0xd7, 0x64, 0x44, 0xf1, 0x36, 0x6c, 0xce, 0x59, 0x35, 0x71, 0xf2, 0x57, 0x1d, 0x1c,
-	0x15, 0xaa, 0x37, 0x6c, 0xc2, 0x03, 0xaa, 0x2f, 0x51, 0x85, 0xd3, 0x47, 0x58, 0x17, 0x0a, 0xca,
-	0x4f, 0x1d, 0x5d, 0x28, 0x3d, 0xda, 0xd1, 0xca, 0x5e, 0xa6, 0xcc, 0x1a, 0x80, 0x07, 0x45, 0x46,
-	0x45, 0x56, 0xdb, 0x6b, 0x8b, 0x14, 0x41, 0xb4, 0x07, 0x20, 0x09, 0xef, 0x53, 0xe9, 0x73, 0xda,
-	0x53, 0x31, 0xd6, 0xf6, 0x56, 0xb4, 0xc4, 0xa3, 0x3d, 0x7c, 0x04, 0x3b, 0x05, 0x97, 0xb2, 0x5d,
-	0x9a, 0x53, 0x31, 0x19, 0xca, 0x59, 0x97, 0xd6, 0x2b, 0x7c, 0x0c, 0xab, 0xe7, 0x22, 0x78, 0xaa,
-	0x12, 0x0e, 0x3f, 0x40, 0x5b, 0x43, 0xd8, 0x10, 0xa0, 0x9c, 0x33, 0x6e, 0x42, 0x50, 0x2f, 0xb0,
-	0x80, 0x6f, 0xee, 0x78, 0x18, 0xa7, 0x6d, 0xaf, 0x8a, 0xa7, 0x3b, 0xd0, 0x88, 0x2f, 0xaf, 0xeb,
-	0x6f, 0xfc, 0x99, 0x29, 0xcb, 0x8d, 0xb9, 0xb2, 0x7c, 0x00, 0x1d, 0x6b, 0xf4, 0x35, 0x7a, 0xdd,
-	0xbf, 0x57, 0x54, 0xe7, 0x9e, 0x35, 0x17, 0x3d, 0x62, 0xa1, 0x3b, 0xe8, 0xcc, 0xcf, 0x3d, 0xe8,
-	0x7d, 0x9e, 0x61, 0x66, 0xc0, 0x72, 0xf7, 0xcb, 0x15, 0x4c, 0xfc, 0xd5, 0xd0, 0x7d, 0xda, 0x9a,
-	0x19, 0x66, 0x50, 0xc1, 0xc1, 0xec, 0xdc, 0xe4, 0x7e, 0xf7, 0x8a, 0xc6, 0x1c, 0x76, 0x76, 0x40,
-	0xc9, 0x60, 0x17, 0xce, 0x42, 0x19, 0xec, 0x92, 0xe9, 0xa6, 0x86, 0xce, 0x00, 0xec, 0xc4, 0x81,
-	0x76, 0xb2, 0x47, 0x52, 0x33, 0x8f, 0xeb, 0x16, 0x6d, 0x25, 0x30, 0xbf, 0xc3, 0x5a, 0x76, 0x60,
-	0x40, 0x7b, 0x49, 0xad, 0x2c, 0x1a, 0x5d, 0xdc, 0x6f, 0xcb, 0xb6, 0xd3, 0x90, 0xd9, 0xe1, 0xc0,
-	0x42, 0x16, 0x4e, 0x20, 0x16, 0xb2, 0x78, 0xa6, 0xc0, 0x35, 0xf4, 0x07, 0xa0, 0x7c, 0x53, 0x47,
-	0x89, 0x9f, 0x4a, 0xa7, 0x0b, 0x17, 0xbf, 0xa6, 0x92, 0xc0, 0x5f, 0xc2, 0x6a, 0xaa, 0x5f, 0xa2,
-	0xc4, 0x63, 0xf9, 0x49, 0xc1, 0xdd, 0x2d, 0xdc, 0x4b, 0x90, 0xee, 0xa0, 0x33, 0xdf, 0x13, 0x6d,
-	0x98, 0x96, 0x34, 0x5f, 0x1b, 0xa6, 0xa5, 0xed, 0xb4, 0x86, 0x2e, 0x00, 0x6c, 0x8b, 0xb1, 0xcf,
-	0x9d, 0xeb, 0x67, 0xf6, 0xb9, 0xf3, 0x1d, 0x09, 0xd7, 0x3e, 0xd4, 0x63, 0x86, 0xf3, 0x2d, 0xc3,
-	0x32, 0x2c, 0xe9, 0x4d, 0x96, 0x61, 0x59, 0xb7, 0xc1, 0x35, 0x74, 0x0d, 0x6f, 0x32, 0x35, 0x1e,
-	0xbd, 0x4b, 0xae, 0x55, 0xd0, 0x70, 0xdc, 0xbd, 0x92, 0xdd, 0x74, 0xf2, 0xe4, 0x8a, 0xa8, 0x4d,
-	0x9e, 0xb2, 0xa6, 0x61, 0x93, 0xa7, 0xb4, 0x02, 0xe3, 0x1a, 0x3a, 0x82, 0xc5, 0xb8, 0x50, 0xa2,
-	0xb7, 0x89, 0xb2, 0xad, 0xbc, 0xee, 0x46, 0x56, 0x98, 0x1c, 0xfa, 0x08, 0xcb, 0xb3, 0x12, 0x86,
-	0xb6, 0x67, 0x3a, 0x73, 0x95, 0xd4, 0x75, 0xf2, 0x1b, 0x33, 0x80, 0x87, 0xa6, 0xfa, 0x23, 0x3c,
-	0xfa, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x5f, 0xc1, 0x43, 0x37, 0x43, 0x0e, 0x00, 0x00,
+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,
 }
diff --git a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/shared.pb.go b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/shared.pb.go
index 665f3dc7d..7b3888ed3 100644
--- a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/shared.pb.go
+++ b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/shared.pb.go
@@ -30,7 +30,7 @@ type Repository struct {
 func (m *Repository) Reset()                    { *m = Repository{} }
 func (m *Repository) String() string            { return proto.CompactTextString(m) }
 func (*Repository) ProtoMessage()               {}
-func (*Repository) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{0} }
+func (*Repository) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{0} }
 
 func (m *Repository) GetStorageName() string {
 	if m != nil {
@@ -80,7 +80,7 @@ type GitCommit struct {
 func (m *GitCommit) Reset()                    { *m = GitCommit{} }
 func (m *GitCommit) String() string            { return proto.CompactTextString(m) }
 func (*GitCommit) ProtoMessage()               {}
-func (*GitCommit) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{1} }
+func (*GitCommit) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{1} }
 
 func (m *GitCommit) GetId() string {
 	if m != nil {
@@ -133,7 +133,7 @@ type CommitAuthor struct {
 func (m *CommitAuthor) Reset()                    { *m = CommitAuthor{} }
 func (m *CommitAuthor) String() string            { return proto.CompactTextString(m) }
 func (*CommitAuthor) ProtoMessage()               {}
-func (*CommitAuthor) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{2} }
+func (*CommitAuthor) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{2} }
 
 func (m *CommitAuthor) GetName() []byte {
 	if m != nil {
@@ -163,7 +163,7 @@ type ExitStatus struct {
 func (m *ExitStatus) Reset()                    { *m = ExitStatus{} }
 func (m *ExitStatus) String() string            { return proto.CompactTextString(m) }
 func (*ExitStatus) ProtoMessage()               {}
-func (*ExitStatus) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{3} }
+func (*ExitStatus) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{3} }
 
 func (m *ExitStatus) GetValue() int32 {
 	if m != nil {
@@ -181,7 +181,7 @@ type Branch struct {
 func (m *Branch) Reset()                    { *m = Branch{} }
 func (m *Branch) String() string            { return proto.CompactTextString(m) }
 func (*Branch) ProtoMessage()               {}
-func (*Branch) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{4} }
+func (*Branch) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{4} }
 
 func (m *Branch) GetName() []byte {
 	if m != nil {
@@ -207,7 +207,7 @@ type Tag struct {
 func (m *Tag) Reset()                    { *m = Tag{} }
 func (m *Tag) String() string            { return proto.CompactTextString(m) }
 func (*Tag) ProtoMessage()               {}
-func (*Tag) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{5} }
+func (*Tag) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{5} }
 
 func (m *Tag) GetName() []byte {
 	if m != nil {
@@ -247,7 +247,7 @@ type User struct {
 func (m *User) Reset()                    { *m = User{} }
 func (m *User) String() string            { return proto.CompactTextString(m) }
 func (*User) ProtoMessage()               {}
-func (*User) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{6} }
+func (*User) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{6} }
 
 func (m *User) GetGlId() string {
 	if m != nil {
@@ -287,9 +287,9 @@ func init() {
 	proto.RegisterType((*User)(nil), "gitaly.User")
 }
 
-func init() { proto.RegisterFile("shared.proto", fileDescriptor9) }
+func init() { proto.RegisterFile("shared.proto", fileDescriptor10) }
 
-var fileDescriptor9 = []byte{
+var fileDescriptor10 = []byte{
 	// 518 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x53, 0x4d, 0x6f, 0xd3, 0x40,
 	0x10, 0x55, 0x1c, 0xc7, 0x90, 0x89, 0x8b, 0x60, 0xc9, 0xc1, 0xaa, 0x54, 0x35, 0x98, 0x4b, 0x0f,
diff --git a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/smarthttp.pb.go b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/smarthttp.pb.go
index 7c2f5769f..e4c89e4a4 100644
--- a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/smarthttp.pb.go
+++ b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/smarthttp.pb.go
@@ -26,7 +26,7 @@ type InfoRefsRequest struct {
 func (m *InfoRefsRequest) Reset()                    { *m = InfoRefsRequest{} }
 func (m *InfoRefsRequest) String() string            { return proto.CompactTextString(m) }
 func (*InfoRefsRequest) ProtoMessage()               {}
-func (*InfoRefsRequest) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{0} }
+func (*InfoRefsRequest) Descriptor() ([]byte, []int) { return fileDescriptor11, []int{0} }
 
 func (m *InfoRefsRequest) GetRepository() *Repository {
 	if m != nil {
@@ -49,7 +49,7 @@ type InfoRefsResponse struct {
 func (m *InfoRefsResponse) Reset()                    { *m = InfoRefsResponse{} }
 func (m *InfoRefsResponse) String() string            { return proto.CompactTextString(m) }
 func (*InfoRefsResponse) ProtoMessage()               {}
-func (*InfoRefsResponse) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{1} }
+func (*InfoRefsResponse) Descriptor() ([]byte, []int) { return fileDescriptor11, []int{1} }
 
 func (m *InfoRefsResponse) GetData() []byte {
 	if m != nil {
@@ -70,7 +70,7 @@ type PostUploadPackRequest struct {
 func (m *PostUploadPackRequest) Reset()                    { *m = PostUploadPackRequest{} }
 func (m *PostUploadPackRequest) String() string            { return proto.CompactTextString(m) }
 func (*PostUploadPackRequest) ProtoMessage()               {}
-func (*PostUploadPackRequest) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{2} }
+func (*PostUploadPackRequest) Descriptor() ([]byte, []int) { return fileDescriptor11, []int{2} }
 
 func (m *PostUploadPackRequest) GetRepository() *Repository {
 	if m != nil {
@@ -101,7 +101,7 @@ type PostUploadPackResponse struct {
 func (m *PostUploadPackResponse) Reset()                    { *m = PostUploadPackResponse{} }
 func (m *PostUploadPackResponse) String() string            { return proto.CompactTextString(m) }
 func (*PostUploadPackResponse) ProtoMessage()               {}
-func (*PostUploadPackResponse) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{3} }
+func (*PostUploadPackResponse) Descriptor() ([]byte, []int) { return fileDescriptor11, []int{3} }
 
 func (m *PostUploadPackResponse) GetData() []byte {
 	if m != nil {
@@ -125,7 +125,7 @@ type PostReceivePackRequest struct {
 func (m *PostReceivePackRequest) Reset()                    { *m = PostReceivePackRequest{} }
 func (m *PostReceivePackRequest) String() string            { return proto.CompactTextString(m) }
 func (*PostReceivePackRequest) ProtoMessage()               {}
-func (*PostReceivePackRequest) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{4} }
+func (*PostReceivePackRequest) Descriptor() ([]byte, []int) { return fileDescriptor11, []int{4} }
 
 func (m *PostReceivePackRequest) GetRepository() *Repository {
 	if m != nil {
@@ -170,7 +170,7 @@ type PostReceivePackResponse struct {
 func (m *PostReceivePackResponse) Reset()                    { *m = PostReceivePackResponse{} }
 func (m *PostReceivePackResponse) String() string            { return proto.CompactTextString(m) }
 func (*PostReceivePackResponse) ProtoMessage()               {}
-func (*PostReceivePackResponse) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{5} }
+func (*PostReceivePackResponse) Descriptor() ([]byte, []int) { return fileDescriptor11, []int{5} }
 
 func (m *PostReceivePackResponse) GetData() []byte {
 	if m != nil {
@@ -485,9 +485,9 @@ var _SmartHTTPService_serviceDesc = grpc.ServiceDesc{
 	Metadata: "smarthttp.proto",
 }
 
-func init() { proto.RegisterFile("smarthttp.proto", fileDescriptor10) }
+func init() { proto.RegisterFile("smarthttp.proto", fileDescriptor11) }
 
-var fileDescriptor10 = []byte{
+var fileDescriptor11 = []byte{
 	// 386 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x93, 0xdd, 0xee, 0xd2, 0x40,
 	0x10, 0xc5, 0x5d, 0xbe, 0x12, 0x06, 0x14, 0x32, 0x44, 0x69, 0x9a, 0x28, 0xa4, 0x26, 0xa6, 0x17,
diff --git a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/ssh.pb.go b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/ssh.pb.go
index f98833dca..32049ed9c 100644
--- a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/ssh.pb.go
+++ b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/ssh.pb.go
@@ -29,7 +29,7 @@ type SSHUploadPackRequest struct {
 func (m *SSHUploadPackRequest) Reset()                    { *m = SSHUploadPackRequest{} }
 func (m *SSHUploadPackRequest) String() string            { return proto.CompactTextString(m) }
 func (*SSHUploadPackRequest) ProtoMessage()               {}
-func (*SSHUploadPackRequest) Descriptor() ([]byte, []int) { return fileDescriptor11, []int{0} }
+func (*SSHUploadPackRequest) Descriptor() ([]byte, []int) { return fileDescriptor12, []int{0} }
 
 func (m *SSHUploadPackRequest) GetRepository() *Repository {
 	if m != nil {
@@ -65,7 +65,7 @@ type SSHUploadPackResponse struct {
 func (m *SSHUploadPackResponse) Reset()                    { *m = SSHUploadPackResponse{} }
 func (m *SSHUploadPackResponse) String() string            { return proto.CompactTextString(m) }
 func (*SSHUploadPackResponse) ProtoMessage()               {}
-func (*SSHUploadPackResponse) Descriptor() ([]byte, []int) { return fileDescriptor11, []int{1} }
+func (*SSHUploadPackResponse) Descriptor() ([]byte, []int) { return fileDescriptor12, []int{1} }
 
 func (m *SSHUploadPackResponse) GetStdout() []byte {
 	if m != nil {
@@ -103,7 +103,7 @@ type SSHReceivePackRequest struct {
 func (m *SSHReceivePackRequest) Reset()                    { *m = SSHReceivePackRequest{} }
 func (m *SSHReceivePackRequest) String() string            { return proto.CompactTextString(m) }
 func (*SSHReceivePackRequest) ProtoMessage()               {}
-func (*SSHReceivePackRequest) Descriptor() ([]byte, []int) { return fileDescriptor11, []int{2} }
+func (*SSHReceivePackRequest) Descriptor() ([]byte, []int) { return fileDescriptor12, []int{2} }
 
 func (m *SSHReceivePackRequest) GetRepository() *Repository {
 	if m != nil {
@@ -153,7 +153,7 @@ type SSHReceivePackResponse struct {
 func (m *SSHReceivePackResponse) Reset()                    { *m = SSHReceivePackResponse{} }
 func (m *SSHReceivePackResponse) String() string            { return proto.CompactTextString(m) }
 func (*SSHReceivePackResponse) ProtoMessage()               {}
-func (*SSHReceivePackResponse) Descriptor() ([]byte, []int) { return fileDescriptor11, []int{3} }
+func (*SSHReceivePackResponse) Descriptor() ([]byte, []int) { return fileDescriptor12, []int{3} }
 
 func (m *SSHReceivePackResponse) GetStdout() []byte {
 	if m != nil {
@@ -356,9 +356,9 @@ var _SSHService_serviceDesc = grpc.ServiceDesc{
 	Metadata: "ssh.proto",
 }
 
-func init() { proto.RegisterFile("ssh.proto", fileDescriptor11) }
+func init() { proto.RegisterFile("ssh.proto", fileDescriptor12) }
 
-var fileDescriptor11 = []byte{
+var fileDescriptor12 = []byte{
 	// 377 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x53, 0xcd, 0xce, 0xd2, 0x40,
 	0x14, 0x75, 0xa4, 0x10, 0xb9, 0xf4, 0x33, 0x64, 0x04, 0xd2, 0x10, 0x7f, 0x48, 0xdd, 0x74, 0x61,
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
index 718a86cbf..62a5dc4d6 100644
--- a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/wiki.pb.go
+++ b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/wiki.pb.go
@@ -26,7 +26,7 @@ type WikiCommitDetails struct {
 func (m *WikiCommitDetails) Reset()                    { *m = WikiCommitDetails{} }
 func (m *WikiCommitDetails) String() string            { return proto.CompactTextString(m) }
 func (*WikiCommitDetails) ProtoMessage()               {}
-func (*WikiCommitDetails) Descriptor() ([]byte, []int) { return fileDescriptor12, []int{0} }
+func (*WikiCommitDetails) Descriptor() ([]byte, []int) { return fileDescriptor13, []int{0} }
 
 func (m *WikiCommitDetails) GetName() []byte {
 	if m != nil {
@@ -57,7 +57,7 @@ type WikiPageVersion struct {
 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{1} }
+func (*WikiPageVersion) Descriptor() ([]byte, []int) { return fileDescriptor13, []int{1} }
 
 func (m *WikiPageVersion) GetCommit() *GitCommit {
 	if m != nil {
@@ -89,7 +89,7 @@ type WikiPage struct {
 func (m *WikiPage) Reset()                    { *m = WikiPage{} }
 func (m *WikiPage) String() string            { return proto.CompactTextString(m) }
 func (*WikiPage) ProtoMessage()               {}
-func (*WikiPage) Descriptor() ([]byte, []int) { return fileDescriptor12, []int{2} }
+func (*WikiPage) Descriptor() ([]byte, []int) { return fileDescriptor13, []int{2} }
 
 func (m *WikiPage) GetVersion() *WikiPageVersion {
 	if m != nil {
@@ -155,7 +155,7 @@ type WikiGetPageVersionsRequest struct {
 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{3} }
+func (*WikiGetPageVersionsRequest) Descriptor() ([]byte, []int) { return fileDescriptor13, []int{3} }
 
 func (m *WikiGetPageVersionsRequest) GetRepository() *Repository {
 	if m != nil {
@@ -178,7 +178,7 @@ type WikiGetPageVersionsResponse struct {
 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{4} }
+func (*WikiGetPageVersionsResponse) Descriptor() ([]byte, []int) { return fileDescriptor13, []int{4} }
 
 func (m *WikiGetPageVersionsResponse) GetVersions() []*WikiPageVersion {
 	if m != nil {
@@ -201,7 +201,7 @@ type WikiWritePageRequest struct {
 func (m *WikiWritePageRequest) Reset()                    { *m = WikiWritePageRequest{} }
 func (m *WikiWritePageRequest) String() string            { return proto.CompactTextString(m) }
 func (*WikiWritePageRequest) ProtoMessage()               {}
-func (*WikiWritePageRequest) Descriptor() ([]byte, []int) { return fileDescriptor12, []int{5} }
+func (*WikiWritePageRequest) Descriptor() ([]byte, []int) { return fileDescriptor13, []int{5} }
 
 func (m *WikiWritePageRequest) GetRepository() *Repository {
 	if m != nil {
@@ -245,7 +245,7 @@ type WikiWritePageResponse struct {
 func (m *WikiWritePageResponse) Reset()                    { *m = WikiWritePageResponse{} }
 func (m *WikiWritePageResponse) String() string            { return proto.CompactTextString(m) }
 func (*WikiWritePageResponse) ProtoMessage()               {}
-func (*WikiWritePageResponse) Descriptor() ([]byte, []int) { return fileDescriptor12, []int{6} }
+func (*WikiWritePageResponse) Descriptor() ([]byte, []int) { return fileDescriptor13, []int{6} }
 
 func (m *WikiWritePageResponse) GetDuplicateError() []byte {
 	if m != nil {
@@ -268,7 +268,7 @@ type WikiUpdatePageRequest struct {
 func (m *WikiUpdatePageRequest) Reset()                    { *m = WikiUpdatePageRequest{} }
 func (m *WikiUpdatePageRequest) String() string            { return proto.CompactTextString(m) }
 func (*WikiUpdatePageRequest) ProtoMessage()               {}
-func (*WikiUpdatePageRequest) Descriptor() ([]byte, []int) { return fileDescriptor12, []int{7} }
+func (*WikiUpdatePageRequest) Descriptor() ([]byte, []int) { return fileDescriptor13, []int{7} }
 
 func (m *WikiUpdatePageRequest) GetRepository() *Repository {
 	if m != nil {
@@ -319,7 +319,7 @@ type WikiUpdatePageResponse struct {
 func (m *WikiUpdatePageResponse) Reset()                    { *m = WikiUpdatePageResponse{} }
 func (m *WikiUpdatePageResponse) String() string            { return proto.CompactTextString(m) }
 func (*WikiUpdatePageResponse) ProtoMessage()               {}
-func (*WikiUpdatePageResponse) Descriptor() ([]byte, []int) { return fileDescriptor12, []int{8} }
+func (*WikiUpdatePageResponse) Descriptor() ([]byte, []int) { return fileDescriptor13, []int{8} }
 
 func (m *WikiUpdatePageResponse) GetError() []byte {
 	if m != nil {
@@ -337,7 +337,7 @@ type WikiDeletePageRequest struct {
 func (m *WikiDeletePageRequest) Reset()                    { *m = WikiDeletePageRequest{} }
 func (m *WikiDeletePageRequest) String() string            { return proto.CompactTextString(m) }
 func (*WikiDeletePageRequest) ProtoMessage()               {}
-func (*WikiDeletePageRequest) Descriptor() ([]byte, []int) { return fileDescriptor12, []int{9} }
+func (*WikiDeletePageRequest) Descriptor() ([]byte, []int) { return fileDescriptor13, []int{9} }
 
 func (m *WikiDeletePageRequest) GetRepository() *Repository {
 	if m != nil {
@@ -366,7 +366,7 @@ type WikiDeletePageResponse struct {
 func (m *WikiDeletePageResponse) Reset()                    { *m = WikiDeletePageResponse{} }
 func (m *WikiDeletePageResponse) String() string            { return proto.CompactTextString(m) }
 func (*WikiDeletePageResponse) ProtoMessage()               {}
-func (*WikiDeletePageResponse) Descriptor() ([]byte, []int) { return fileDescriptor12, []int{10} }
+func (*WikiDeletePageResponse) Descriptor() ([]byte, []int) { return fileDescriptor13, []int{10} }
 
 type WikiFindPageRequest struct {
 	Repository *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"`
@@ -378,7 +378,7 @@ type WikiFindPageRequest struct {
 func (m *WikiFindPageRequest) Reset()                    { *m = WikiFindPageRequest{} }
 func (m *WikiFindPageRequest) String() string            { return proto.CompactTextString(m) }
 func (*WikiFindPageRequest) ProtoMessage()               {}
-func (*WikiFindPageRequest) Descriptor() ([]byte, []int) { return fileDescriptor12, []int{11} }
+func (*WikiFindPageRequest) Descriptor() ([]byte, []int) { return fileDescriptor13, []int{11} }
 
 func (m *WikiFindPageRequest) GetRepository() *Repository {
 	if m != nil {
@@ -417,7 +417,7 @@ type WikiFindPageResponse struct {
 func (m *WikiFindPageResponse) Reset()                    { *m = WikiFindPageResponse{} }
 func (m *WikiFindPageResponse) String() string            { return proto.CompactTextString(m) }
 func (*WikiFindPageResponse) ProtoMessage()               {}
-func (*WikiFindPageResponse) Descriptor() ([]byte, []int) { return fileDescriptor12, []int{12} }
+func (*WikiFindPageResponse) Descriptor() ([]byte, []int) { return fileDescriptor13, []int{12} }
 
 func (m *WikiFindPageResponse) GetPage() *WikiPage {
 	if m != nil {
@@ -436,7 +436,7 @@ type WikiFindFileRequest struct {
 func (m *WikiFindFileRequest) Reset()                    { *m = WikiFindFileRequest{} }
 func (m *WikiFindFileRequest) String() string            { return proto.CompactTextString(m) }
 func (*WikiFindFileRequest) ProtoMessage()               {}
-func (*WikiFindFileRequest) Descriptor() ([]byte, []int) { return fileDescriptor12, []int{13} }
+func (*WikiFindFileRequest) Descriptor() ([]byte, []int) { return fileDescriptor13, []int{13} }
 
 func (m *WikiFindFileRequest) GetRepository() *Repository {
 	if m != nil {
@@ -470,7 +470,7 @@ type WikiFindFileResponse struct {
 func (m *WikiFindFileResponse) Reset()                    { *m = WikiFindFileResponse{} }
 func (m *WikiFindFileResponse) String() string            { return proto.CompactTextString(m) }
 func (*WikiFindFileResponse) ProtoMessage()               {}
-func (*WikiFindFileResponse) Descriptor() ([]byte, []int) { return fileDescriptor12, []int{14} }
+func (*WikiFindFileResponse) Descriptor() ([]byte, []int) { return fileDescriptor13, []int{14} }
 
 func (m *WikiFindFileResponse) GetName() []byte {
 	if m != nil {
@@ -507,7 +507,7 @@ type WikiGetAllPagesRequest struct {
 func (m *WikiGetAllPagesRequest) Reset()                    { *m = WikiGetAllPagesRequest{} }
 func (m *WikiGetAllPagesRequest) String() string            { return proto.CompactTextString(m) }
 func (*WikiGetAllPagesRequest) ProtoMessage()               {}
-func (*WikiGetAllPagesRequest) Descriptor() ([]byte, []int) { return fileDescriptor12, []int{15} }
+func (*WikiGetAllPagesRequest) Descriptor() ([]byte, []int) { return fileDescriptor13, []int{15} }
 
 func (m *WikiGetAllPagesRequest) GetRepository() *Repository {
 	if m != nil {
@@ -526,7 +526,7 @@ type WikiGetAllPagesResponse struct {
 func (m *WikiGetAllPagesResponse) Reset()                    { *m = WikiGetAllPagesResponse{} }
 func (m *WikiGetAllPagesResponse) String() string            { return proto.CompactTextString(m) }
 func (*WikiGetAllPagesResponse) ProtoMessage()               {}
-func (*WikiGetAllPagesResponse) Descriptor() ([]byte, []int) { return fileDescriptor12, []int{16} }
+func (*WikiGetAllPagesResponse) Descriptor() ([]byte, []int) { return fileDescriptor13, []int{16} }
 
 func (m *WikiGetAllPagesResponse) GetPage() *WikiPage {
 	if m != nil {
@@ -1011,9 +1011,9 @@ var _WikiService_serviceDesc = grpc.ServiceDesc{
 	Metadata: "wiki.proto",
 }
 
-func init() { proto.RegisterFile("wiki.proto", fileDescriptor12) }
+func init() { proto.RegisterFile("wiki.proto", fileDescriptor13) }
 
-var fileDescriptor12 = []byte{
+var fileDescriptor13 = []byte{
 	// 825 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xcb, 0x72, 0x1b, 0x45,
 	0x14, 0xcd, 0x48, 0xb2, 0x34, 0xba, 0x72, 0x1c, 0xd2, 0x84, 0x64, 0x32, 0x32, 0xc2, 0xd5, 0x50,
diff --git a/vendor/vendor.json b/vendor/vendor.json
index bda79b5ae..2ccb6a096 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -201,12 +201,12 @@
 			"revisionTime": "2017-01-30T11:31:45Z"
 		},
 		{
-			"checksumSHA1": "wqiEiQvCNmzeYfjBtfSh0tOYoYs=",
+			"checksumSHA1": "XMylANBPKE261AGhHeksUFRC7KQ=",
 			"path": "gitlab.com/gitlab-org/gitaly-proto/go",
-			"revision": "fa425603222fbb85574be486460e88c84f49b77d",
-			"revisionTime": "2017-12-04T16:31:46Z",
-			"version": "v0.59.0",
-			"versionExact": "v0.59.0"
+			"revision": "21e2d599e812e4b55a902e7d48ea4a3618674b16",
+			"revisionTime": "2017-12-07T16:49:09Z",
+			"version": "v0.60.0",
+			"versionExact": "v0.60.0"
 		},
 		{
 			"checksumSHA1": "nqWNlnMmVpt628zzvyo6Yv2CX5Q=",