Prune large patches by default

7 files changed, 175 insertions, 76 deletions

diff --git a/changelogs/unreleased/osw-prune-large-patches-by-default.yml b/changelogs/unreleased/osw-prune-large-patches-by-default.yml
new file mode 100644
index 000000000..1a7bb4e69
--- /dev/null
+++ b/changelogs/unreleased/osw-prune-large-patches-by-default.yml
@@ -0,0 +1,5 @@
+---
+title: Prune large patches by default when enforcing limits
+merge_request: 858
+author:
+type: fixed
diff --git a/internal/diff/diff.go b/internal/diff/diff.go
index 1cc02aeaa..1d5966d73 100644
--- a/internal/diff/diff.go
+++ b/internal/diff/diff.go
@@ -14,22 +14,25 @@ import (
 
 const blankID = "0000000000000000000000000000000000000000"
 
+// MaxPatchBytes is a limitation of a single diff patch,
+// patches surpassing this limit are pruned by default.
+const MaxPatchBytes = 100000
+
 // Diff represents a single parsed diff entry
 type Diff struct {
-	FromID   string
-	ToID     string
-	OldMode  int32
-	NewMode  int32
-	FromPath []byte
-	ToPath   []byte
-	Binary   bool
-	Status   byte
-	Patch    []byte
-	// OverflowMarker is used to inform caller (GitLab) that there are more diffs to display but a limit was reached instead.
+	FromID         string
+	ToID           string
+	OldMode        int32
+	NewMode        int32
+	FromPath       []byte
+	ToPath         []byte
+	Binary         bool
+	Status         byte
+	Patch          []byte
 	OverflowMarker bool
-	// Collapsed means a soft limit was reached and the patch was pruned.
-	Collapsed bool
-	lineCount int
+	Collapsed      bool
+	TooLarge       bool
+	lineCount      int
 }
 
 // Parser holds necessary state for parsing a diff stream
@@ -149,13 +152,17 @@ func (parser *Parser) Parse() bool {
 	}
 
 	if parser.limits.CollapseDiffs && parser.isOverSafeLimits() && parser.currentDiff.lineCount > 0 {
-		parser.linesProcessed -= parser.currentDiff.lineCount
-		parser.bytesProcessed -= len(parser.currentDiff.Patch)
+		parser.prunePatch()
 		parser.currentDiff.Collapsed = true
-		parser.currentDiff.Patch = nil
 	}
 
 	if parser.limits.EnforceLimits {
+		// Apply single-file size limit
+		if len(parser.currentDiff.Patch) >= MaxPatchBytes {
+			parser.prunePatch()
+			parser.currentDiff.TooLarge = true
+		}
+
 		maxFilesExceeded := parser.filesProcessed > parser.limits.MaxFiles
 		maxBytesOrLinesExceeded := parser.bytesProcessed >= parser.limits.MaxBytes || parser.linesProcessed >= parser.limits.MaxLines
 
@@ -168,6 +175,14 @@ func (parser *Parser) Parse() bool {
 	return true
 }
 
+// prunePatch nullifies the current diff patch and reduce lines and bytes processed
+// according to it.
+func (parser *Parser) prunePatch() {
+	parser.linesProcessed -= parser.currentDiff.lineCount
+	parser.bytesProcessed -= len(parser.currentDiff.Patch)
+	parser.currentDiff.Patch = nil
+}
+
 // Diff returns a successfully parsed diff. It should be called only when Parser.Parse()
 // returns true.
 func (parser *Parser) Diff() *Diff {
diff --git a/internal/diff/diff_test.go b/internal/diff/diff_test.go
index d7eccb1f8..abece29e3 100644
--- a/internal/diff/diff_test.go
+++ b/internal/diff/diff_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func TestDiffParserWithLargeDiff(t *testing.T) {
+func TestDiffParserWithLargeDiffWithTrueCollapseDiffsFlag(t *testing.T) {
 	bigPatch := strings.Repeat("+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.\n", 100000)
 	rawDiff := fmt.Sprintf(`:000000 100644 0000000000000000000000000000000000000000 4cc7061661b8f52891bc1b39feb4d856b21a1067 A	big.txt
 :000000 100644 0000000000000000000000000000000000000000 3be11c69355948412925fa5e073d76d58ff3afd2 A	file-00.txt
@@ -69,6 +69,73 @@ index 0000000000000000000000000000000000000000..3be11c69355948412925fa5e073d76d5
 	require.Equal(t, expectedDiffs, diffs)
 }
 
+func TestDiffParserWithLargeDiffWithFalseCollapseDiffsFlag(t *testing.T) {
+	bigPatch := strings.Repeat("+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.\n", 100000)
+	rawDiff := fmt.Sprintf(`:000000 100644 0000000000000000000000000000000000000000 4cc7061661b8f52891bc1b39feb4d856b21a1067 A	big.txt
+:000000 100644 0000000000000000000000000000000000000000 3be11c69355948412925fa5e073d76d58ff3afd2 A	file-00.txt
+
+diff --git a/big.txt b/big.txt
+new file mode 100644
+index 0000000000000000000000000000000000000000..4cc7061661b8f52891bc1b39feb4d856b21a1067
+--- /dev/null
++++ b/big.txt
+@@ -0,0 +1,100000 @@
+%sdiff --git a/file-00.txt b/file-00.txt
+new file mode 100644
+index 0000000000000000000000000000000000000000..3be11c69355948412925fa5e073d76d58ff3afd2
+--- /dev/null
++++ b/file-00.txt
+@@ -0,0 +1 @@
++Lorem ipsum
+`, bigPatch)
+
+	limits := Limits{
+		EnforceLimits: true,
+		SafeMaxFiles:  3,
+		SafeMaxBytes:  200,
+		SafeMaxLines:  200,
+		MaxFiles:      4,
+		MaxBytes:      10000000,
+		MaxLines:      10000000,
+		CollapseDiffs: false,
+	}
+	diffParser := NewDiffParser(strings.NewReader(rawDiff), limits)
+
+	diffs := []*Diff{}
+	for diffParser.Parse() {
+		diffs = append(diffs, diffParser.Diff())
+	}
+
+	expectedDiffs := []*Diff{
+		&Diff{
+			OldMode:   0,
+			NewMode:   0100644,
+			FromID:    "0000000000000000000000000000000000000000",
+			ToID:      "4cc7061661b8f52891bc1b39feb4d856b21a1067",
+			FromPath:  []byte("big.txt"),
+			ToPath:    []byte("big.txt"),
+			Status:    'A',
+			Collapsed: false,
+			lineCount: 100000,
+			TooLarge:  true,
+		},
+		&Diff{
+			OldMode:   0,
+			NewMode:   0100644,
+			FromID:    "0000000000000000000000000000000000000000",
+			ToID:      "3be11c69355948412925fa5e073d76d58ff3afd2",
+			FromPath:  []byte("file-00.txt"),
+			ToPath:    []byte("file-00.txt"),
+			Status:    'A',
+			Collapsed: false,
+			Patch:     []byte("@@ -0,0 +1 @@\n+Lorem ipsum\n"),
+			lineCount: 1,
+		},
+	}
+
+	require.Equal(t, expectedDiffs, diffs)
+}
+
 func TestDiffParserWithLargeDiffOfSmallPatches(t *testing.T) {
 	patch := "@@ -0,0 +1,5 @@\n" + strings.Repeat("+Lorem\n", 5)
 	rawDiff := `:000000 100644 0000000000000000000000000000000000000000 b6507e5b5ce18077e3ec8aaa2291404e5051d45d A	expand-collapse/file-0.txt
diff --git a/internal/service/diff/commit.go b/internal/service/diff/commit.go
index fb1c1997b..45cd3f8f4 100644
--- a/internal/service/diff/commit.go
+++ b/internal/service/diff/commit.go
@@ -77,6 +77,7 @@ func (s *server) CommitDiff(in *pb.CommitDiffRequest, stream pb.DiffService_Comm
 			Binary:         diff.Binary,
 			OverflowMarker: diff.OverflowMarker,
 			Collapsed:      diff.Collapsed,
+			TooLarge:       diff.TooLarge,
 		}
 
 		if len(diff.Patch) <= s.MsgSizeThreshold {
diff --git a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION
index e23e3fd29..5fea17685 100644
--- a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION
+++ b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION
@@ -1 +1 @@
-0.112.0
+0.113.0
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 a9a6231be..a220e087a 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
@@ -145,6 +145,8 @@ type CommitDiffResponse struct {
 	// in which case only this attribute will be set.
 	OverflowMarker bool `protobuf:"varint,11,opt,name=overflow_marker,json=overflowMarker" json:"overflow_marker,omitempty"`
 	Collapsed      bool `protobuf:"varint,12,opt,name=collapsed" json:"collapsed,omitempty"`
+	// Patch is too large and has been pruned
+	TooLarge bool `protobuf:"varint,13,opt,name=too_large,json=tooLarge" json:"too_large,omitempty"`
 }
 
 func (m *CommitDiffResponse) Reset()                    { *m = CommitDiffResponse{} }
@@ -229,6 +231,13 @@ func (m *CommitDiffResponse) GetCollapsed() bool {
 	return false
 }
 
+func (m *CommitDiffResponse) GetTooLarge() bool {
+	if m != nil {
+		return m.TooLarge
+	}
+	return false
+}
+
 type CommitDeltaRequest struct {
 	Repository    *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"`
 	LeftCommitId  string      `protobuf:"bytes,2,opt,name=left_commit_id,json=leftCommitId" json:"left_commit_id,omitempty"`
@@ -981,57 +990,59 @@ var _DiffService_serviceDesc = grpc.ServiceDesc{
 func init() { proto.RegisterFile("diff.proto", fileDescriptor4) }
 
 var fileDescriptor4 = []byte{
-	// 831 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x56, 0xcd, 0x6e, 0x33, 0x35,
-	0x14, 0x65, 0x9a, 0x64, 0x32, 0xb9, 0x99, 0xa6, 0xad, 0x8b, 0xfa, 0x4d, 0xf3, 0xb1, 0x88, 0x46,
-	0xb4, 0x0d, 0x42, 0xaa, 0x50, 0xd8, 0xb0, 0x40, 0x48, 0xb4, 0x15, 0xa8, 0x55, 0x2b, 0xaa, 0x61,
-	0xc1, 0x82, 0xc5, 0xc8, 0x8d, 0x3d, 0x89, 0xc5, 0xcc, 0x38, 0xd8, 0xa6, 0x69, 0x5e, 0x03, 0x78,
-	0x07, 0x36, 0xec, 0x79, 0x18, 0x5e, 0x85, 0x05, 0xb2, 0x3d, 0x7f, 0x69, 0xa3, 0x6e, 0xfa, 0x2d,
-	0xb2, 0x8b, 0xcf, 0x39, 0x73, 0xef, 0xf1, 0xfd, 0x71, 0x0b, 0x40, 0x58, 0x92, 0x9c, 0x2f, 0x04,
-	0x57, 0x1c, 0xb9, 0x33, 0xa6, 0x70, 0xba, 0x1a, 0xfa, 0x72, 0x8e, 0x05, 0x25, 0x16, 0x0d, 0xff,
-	0x6b, 0xc1, 0xc1, 0x25, 0xcf, 0x32, 0xa6, 0xae, 0x58, 0x92, 0x44, 0xf4, 0xd7, 0xdf, 0xa8, 0x54,
-	0x68, 0x02, 0x20, 0xe8, 0x82, 0x4b, 0xa6, 0xb8, 0x58, 0x05, 0xce, 0xc8, 0x19, 0xf7, 0x27, 0xe8,
-	0xdc, 0x06, 0x38, 0x8f, 0x2a, 0x26, 0x6a, 0xa8, 0xd0, 0xa7, 0x30, 0x48, 0x69, 0xa2, 0xe2, 0xa9,
-	0x89, 0x16, 0x33, 0x12, 0xec, 0x8c, 0x9c, 0x71, 0x2f, 0xf2, 0x35, 0x6a, 0x53, 0x5c, 0x13, 0x74,
-	0x0a, 0x7b, 0x82, 0xcd, 0xe6, 0x4d, 0x59, 0xcb, 0xc8, 0x76, 0x0d, 0x5c, 0xe9, 0xbe, 0x82, 0x80,
-	0xcd, 0x72, 0x2e, 0x68, 0xbc, 0x9c, 0x33, 0x45, 0xe5, 0x02, 0x4f, 0x69, 0x3c, 0x9d, 0xe3, 0x7c,
-	0x46, 0x83, 0xf6, 0xc8, 0x19, 0x7b, 0xd1, 0x91, 0xe5, 0x7f, 0xaa, 0xe8, 0x4b, 0xc3, 0xa2, 0x8f,
-	0xa1, 0xb3, 0xc0, 0x6a, 0x2e, 0x83, 0xce, 0xa8, 0x35, 0xf6, 0x23, 0x7b, 0x40, 0x27, 0x30, 0x98,
-	0xf2, 0x34, 0xc5, 0x0b, 0x49, 0x63, 0x5d, 0x14, 0x19, 0xb8, 0x26, 0xca, 0x6e, 0x89, 0xea, 0xeb,
-	0x1b, 0x19, 0xcd, 0x13, 0x2e, 0xa6, 0x34, 0x4e, 0x59, 0xc6, 0x94, 0x0c, 0xba, 0x56, 0x56, 0xa0,
-	0xb7, 0x06, 0x44, 0xef, 0xa1, 0x97, 0xe1, 0xa7, 0x38, 0x61, 0x29, 0x95, 0x81, 0x37, 0x72, 0xc6,
-	0x9d, 0xc8, 0xcb, 0xf0, 0xd3, 0x77, 0xfa, 0x5c, 0x92, 0x29, 0xcb, 0xa9, 0x0c, 0x7a, 0x15, 0x79,
-	0xab, 0xcf, 0x25, 0xf9, 0xb0, 0x52, 0x54, 0x06, 0x50, 0x91, 0x17, 0xfa, 0xac, 0x4b, 0x28, 0x71,
-	0x42, 0xe3, 0x3a, 0x76, 0xdf, 0x28, 0x7c, 0x8d, 0xde, 0x95, 0xf1, 0x9b, 0x2a, 0x9b, 0xc4, 0x5f,
-	0x53, 0xd9, 0x44, 0x4d, 0x95, 0xcd, 0xb6, 0xbb, 0xa6, 0x32, 0x19, 0xc3, 0x7f, 0x77, 0x00, 0x35,
-	0xdb, 0x2f, 0x17, 0x3c, 0x97, 0x54, 0xbb, 0x4c, 0x04, 0xcf, 0x62, 0x5d, 0x3b, 0xd3, 0x7e, 0x3f,
-	0xf2, 0x34, 0x70, 0x8f, 0xd5, 0x1c, 0xbd, 0x83, 0xae, 0xe2, 0x96, 0xda, 0x31, 0x94, 0xab, 0x78,
-	0x49, 0x98, 0xaf, 0xaa, 0x9e, 0xba, 0xfa, 0x78, 0x4d, 0xd0, 0x21, 0x74, 0x14, 0xd7, 0x70, 0xdb,
-	0xc0, 0x6d, 0xc5, 0xaf, 0x09, 0x3a, 0x06, 0x8f, 0xa7, 0x24, 0xce, 0x38, 0xa1, 0x41, 0xc7, 0x58,
-	0xeb, 0xf2, 0x94, 0xdc, 0x71, 0x42, 0x35, 0x95, 0xd3, 0xa5, 0xa5, 0x5c, 0x4b, 0xe5, 0x74, 0x69,
-	0xa8, 0x23, 0x70, 0x1f, 0x58, 0x8e, 0xc5, 0xaa, 0x68, 0x4c, 0x71, 0xd2, 0xd7, 0x15, 0x78, 0xa9,
-	0x5d, 0x4d, 0xe7, 0x31, 0xc1, 0x0a, 0x9b, 0xca, 0xfb, 0x91, 0x2f, 0xf0, 0xf2, 0x5e, 0x83, 0x57,
-	0x58, 0x61, 0x34, 0x02, 0x9f, 0xe6, 0x24, 0xe6, 0x89, 0x15, 0x9a, 0x06, 0x78, 0x11, 0xd0, 0x9c,
-	0xfc, 0x90, 0x18, 0x15, 0x3a, 0x83, 0x3d, 0xfe, 0x48, 0x45, 0x92, 0xf2, 0x65, 0x9c, 0x61, 0xf1,
-	0x0b, 0x15, 0xa6, 0x07, 0x5e, 0x34, 0x28, 0xe1, 0x3b, 0x83, 0xa2, 0x4f, 0xa0, 0x57, 0x8e, 0x0e,
-	0x31, 0x0d, 0xf0, 0xa2, 0x1a, 0xb8, 0x69, 0x7b, 0xde, 0x7e, 0x2f, 0xfc, 0xdb, 0xa9, 0xaa, 0x4b,
-	0x53, 0x85, 0xb7, 0x67, 0xbb, 0xaa, 0x1d, 0x69, 0x37, 0x76, 0x24, 0xfc, 0xcb, 0x81, 0x7e, 0xc3,
-	0xee, 0xf6, 0x4e, 0x41, 0x78, 0x01, 0x87, 0x6b, 0x75, 0x2d, 0xc6, 0xf6, 0x73, 0x70, 0x89, 0x06,
-	0x64, 0xe0, 0x8c, 0x5a, 0xe3, 0xfe, 0xe4, 0xb0, 0x2c, 0x6a, 0x53, 0x5c, 0x48, 0x42, 0x52, 0xf6,
-	0xc6, 0x34, 0xfe, 0x2d, 0xbd, 0x19, 0x82, 0x27, 0xe8, 0x23, 0x93, 0x8c, 0xe7, 0x45, 0x2d, 0xaa,
-	0x73, 0xf8, 0x59, 0xe9, 0xb4, 0xc8, 0x52, 0x38, 0x45, 0xd0, 0x36, 0x43, 0x6a, 0xab, 0x6a, 0x7e,
-	0x87, 0xbf, 0x3b, 0x30, 0x88, 0xf0, 0x72, 0xab, 0xde, 0xe1, 0xf0, 0x04, 0xf6, 0x2a, 0x4f, 0xaf,
-	0x78, 0xff, 0xc3, 0x31, 0xba, 0x37, 0x97, 0xf2, 0xc3, 0x9a, 0x3f, 0x85, 0xfd, 0xda, 0xd4, 0x2b,
-	0xee, 0xff, 0x74, 0x60, 0x5f, 0x5f, 0xf1, 0x47, 0x85, 0x95, 0xdc, 0x1e, 0xfb, 0x3f, 0x43, 0xaf,
-	0x72, 0xa5, 0x7d, 0x37, 0xf6, 0xd0, 0xfc, 0xd6, 0x6f, 0x10, 0x26, 0x84, 0x29, 0xc6, 0x73, 0x69,
-	0x32, 0x75, 0xa2, 0x1a, 0xd0, 0x2c, 0xa1, 0x29, 0xb5, 0x6c, 0xcb, 0xb2, 0x15, 0x10, 0x7e, 0x0d,
-	0x07, 0x8d, 0x2b, 0x17, 0xc5, 0x39, 0x83, 0x8e, 0xd4, 0x40, 0xb1, 0x3f, 0x07, 0xe5, 0x75, 0x6b,
-	0xa5, 0xe5, 0x27, 0xff, 0xb4, 0xa0, 0x6f, 0x40, 0x2a, 0x1e, 0xd9, 0x94, 0xa2, 0xef, 0x01, 0xea,
-	0x3f, 0x23, 0xe8, 0xf8, 0xd9, 0xde, 0xd5, 0x13, 0x3d, 0x1c, 0x6e, 0xa2, 0x6c, 0xf6, 0xf0, 0xa3,
-	0x2f, 0x1c, 0x74, 0xb3, 0xfe, 0x04, 0x0d, 0x37, 0x6d, 0x70, 0x11, 0xea, 0xfd, 0x46, 0x6e, 0x53,
-	0x2c, 0xfb, 0xb4, 0x3f, 0x8b, 0xd5, 0x9c, 0xd5, 0xe7, 0xb1, 0xd6, 0x46, 0xc6, 0xc4, 0xfa, 0x06,
-	0xba, 0xc5, 0x1e, 0xa0, 0xa3, 0x6a, 0x08, 0xd6, 0x96, 0x75, 0xf8, 0xee, 0x05, 0xde, 0xf8, 0xfe,
-	0x5b, 0xf0, 0xca, 0x51, 0x44, 0x4d, 0xe1, 0x9a, 0x8b, 0xe0, 0x25, 0xd1, 0x08, 0x71, 0xd5, 0x1c,
-	0x87, 0xe0, 0x65, 0x6b, 0x8a, 0x20, 0xc7, 0x1b, 0x98, 0x3a, 0xca, 0x83, 0x6b, 0xfe, 0xef, 0xfb,
-	0xf2, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x5d, 0xc8, 0xdc, 0x4e, 0x1b, 0x0a, 0x00, 0x00,
+	// 849 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x56, 0xcb, 0x6e, 0x23, 0x45,
+	0x14, 0xa5, 0x63, 0xbb, 0xd3, 0xbe, 0xee, 0xbc, 0x2a, 0x28, 0xd3, 0xf1, 0xb0, 0xb0, 0x5a, 0xcc,
+	0x8c, 0x11, 0x52, 0x84, 0xc2, 0x86, 0x05, 0x42, 0x62, 0x26, 0x02, 0x65, 0x94, 0x88, 0x51, 0xb3,
+	0x60, 0xc1, 0xa2, 0x55, 0x71, 0xdd, 0xb6, 0x4b, 0x74, 0x77, 0x99, 0xaa, 0x22, 0x1e, 0xff, 0x06,
+	0xf0, 0x0f, 0x6c, 0xd8, 0xf3, 0x6b, 0x2c, 0x58, 0xa0, 0xaa, 0xea, 0x97, 0x13, 0x6b, 0x36, 0x33,
+	0x0b, 0xef, 0x5c, 0xe7, 0x9c, 0xbe, 0xf7, 0xd4, 0x7d, 0x54, 0x02, 0xc0, 0x78, 0x96, 0x5d, 0x2c,
+	0xa5, 0xd0, 0x82, 0xf8, 0x73, 0xae, 0x69, 0xbe, 0x1e, 0x87, 0x6a, 0x41, 0x25, 0x32, 0x87, 0xc6,
+	0xff, 0xf5, 0xe0, 0xe4, 0x95, 0x28, 0x0a, 0xae, 0xaf, 0x78, 0x96, 0x25, 0xf8, 0xeb, 0x6f, 0xa8,
+	0x34, 0xb9, 0x04, 0x90, 0xb8, 0x14, 0x8a, 0x6b, 0x21, 0xd7, 0x91, 0x37, 0xf1, 0xa6, 0xa3, 0x4b,
+	0x72, 0xe1, 0x02, 0x5c, 0x24, 0x0d, 0x93, 0x74, 0x54, 0xe4, 0x53, 0x38, 0xcc, 0x31, 0xd3, 0xe9,
+	0xcc, 0x46, 0x4b, 0x39, 0x8b, 0xf6, 0x26, 0xde, 0x74, 0x98, 0x84, 0x06, 0x75, 0x29, 0xae, 0x19,
+	0x79, 0x0e, 0x47, 0x92, 0xcf, 0x17, 0x5d, 0x59, 0xcf, 0xca, 0x0e, 0x2c, 0xdc, 0xe8, 0xbe, 0x82,
+	0x88, 0xcf, 0x4b, 0x21, 0x31, 0x5d, 0x2d, 0xb8, 0x46, 0xb5, 0xa4, 0x33, 0x4c, 0x67, 0x0b, 0x5a,
+	0xce, 0x31, 0xea, 0x4f, 0xbc, 0x69, 0x90, 0x9c, 0x39, 0xfe, 0xa7, 0x86, 0x7e, 0x65, 0x59, 0xf2,
+	0x31, 0x0c, 0x96, 0x54, 0x2f, 0x54, 0x34, 0x98, 0xf4, 0xa6, 0x61, 0xe2, 0x0e, 0xe4, 0x19, 0x1c,
+	0xce, 0x44, 0x9e, 0xd3, 0xa5, 0xc2, 0xd4, 0x14, 0x45, 0x45, 0xbe, 0x8d, 0x72, 0x50, 0xa3, 0xe6,
+	0xfa, 0x56, 0x86, 0x65, 0x26, 0xe4, 0x0c, 0xd3, 0x9c, 0x17, 0x5c, 0xab, 0x68, 0xdf, 0xc9, 0x2a,
+	0xf4, 0xc6, 0x82, 0xe4, 0x29, 0x0c, 0x0b, 0xfa, 0x36, 0xcd, 0x78, 0x8e, 0x2a, 0x0a, 0x26, 0xde,
+	0x74, 0x90, 0x04, 0x05, 0x7d, 0xfb, 0x9d, 0x39, 0xd7, 0x64, 0xce, 0x4b, 0x54, 0xd1, 0xb0, 0x21,
+	0x6f, 0xcc, 0xb9, 0x26, 0xef, 0xd6, 0x1a, 0x55, 0x04, 0x0d, 0xf9, 0xd2, 0x9c, 0x4d, 0x09, 0x15,
+	0xcd, 0x30, 0x6d, 0x63, 0x8f, 0xac, 0x22, 0x34, 0xe8, 0x6d, 0x1d, 0xbf, 0xab, 0x72, 0x49, 0xc2,
+	0x0d, 0x95, 0x4b, 0xd4, 0x55, 0xb9, 0x6c, 0x07, 0x1b, 0x2a, 0x9b, 0x31, 0xfe, 0x77, 0x0f, 0x48,
+	0xb7, 0xfd, 0x6a, 0x29, 0x4a, 0x85, 0xc6, 0x65, 0x26, 0x45, 0x91, 0x9a, 0xda, 0xd9, 0xf6, 0x87,
+	0x49, 0x60, 0x80, 0x37, 0x54, 0x2f, 0xc8, 0x13, 0xd8, 0xd7, 0xc2, 0x51, 0x7b, 0x96, 0xf2, 0xb5,
+	0xa8, 0x09, 0xfb, 0x55, 0xd3, 0x53, 0xdf, 0x1c, 0xaf, 0x19, 0x39, 0x85, 0x81, 0x16, 0x06, 0xee,
+	0x5b, 0xb8, 0xaf, 0xc5, 0x35, 0x23, 0xe7, 0x10, 0x88, 0x9c, 0xa5, 0x85, 0x60, 0x18, 0x0d, 0xac,
+	0xb5, 0x7d, 0x91, 0xb3, 0x5b, 0xc1, 0xd0, 0x50, 0x25, 0xae, 0x1c, 0xe5, 0x3b, 0xaa, 0xc4, 0x95,
+	0xa5, 0xce, 0xc0, 0xbf, 0xe3, 0x25, 0x95, 0xeb, 0xaa, 0x31, 0xd5, 0xc9, 0x5c, 0x57, 0xd2, 0x95,
+	0x71, 0x35, 0x5b, 0xa4, 0x8c, 0x6a, 0x6a, 0x2b, 0x1f, 0x26, 0xa1, 0xa4, 0xab, 0x37, 0x06, 0xbc,
+	0xa2, 0x9a, 0x92, 0x09, 0x84, 0x58, 0xb2, 0x54, 0x64, 0x4e, 0x68, 0x1b, 0x10, 0x24, 0x80, 0x25,
+	0xfb, 0x21, 0xb3, 0x2a, 0xf2, 0x02, 0x8e, 0xc4, 0x3d, 0xca, 0x2c, 0x17, 0xab, 0xb4, 0xa0, 0xf2,
+	0x17, 0x94, 0xb6, 0x07, 0x41, 0x72, 0x58, 0xc3, 0xb7, 0x16, 0x25, 0x9f, 0xc0, 0xb0, 0x1e, 0x1d,
+	0x66, 0x1b, 0x10, 0x24, 0x2d, 0x60, 0x0a, 0xa8, 0x85, 0x48, 0x73, 0x2a, 0xe7, 0x68, 0x0b, 0x1f,
+	0x24, 0x81, 0x16, 0xe2, 0xc6, 0x9c, 0x5f, 0xf7, 0x83, 0xe0, 0x78, 0x18, 0xff, 0xed, 0x35, 0xa5,
+	0xc7, 0x5c, 0xd3, 0xdd, 0x59, 0xbd, 0x66, 0x81, 0xfa, 0x9d, 0x05, 0x8a, 0xff, 0xf2, 0x60, 0xd4,
+	0xb1, 0xbb, 0xbb, 0x23, 0x12, 0xbf, 0x84, 0xd3, 0x8d, 0xba, 0x56, 0x33, 0xfd, 0x39, 0xf8, 0xcc,
+	0x00, 0x2a, 0xf2, 0x26, 0xbd, 0xe9, 0xe8, 0xf2, 0xb4, 0x2e, 0x6a, 0x57, 0x5c, 0x49, 0x62, 0x56,
+	0xf7, 0xc6, 0x4e, 0xc5, 0xfb, 0xf4, 0x66, 0x0c, 0x81, 0xc4, 0x7b, 0xae, 0xb8, 0x28, 0xab, 0x5a,
+	0x34, 0xe7, 0xf8, 0xb3, 0xda, 0x69, 0x95, 0xa5, 0x72, 0x4a, 0xa0, 0x6f, 0x27, 0xd8, 0x55, 0xd5,
+	0xfe, 0x8e, 0x7f, 0xf7, 0xe0, 0x30, 0xa1, 0xab, 0x9d, 0x7a, 0xa4, 0xe3, 0x67, 0x70, 0xd4, 0x78,
+	0x7a, 0x87, 0xf7, 0x3f, 0x3c, 0xab, 0x7b, 0xef, 0x52, 0x7e, 0x58, 0xf3, 0xcf, 0xe1, 0xb8, 0x35,
+	0xf5, 0x0e, 0xf7, 0x7f, 0x7a, 0x70, 0x6c, 0xae, 0xf8, 0xa3, 0xa6, 0x5a, 0xed, 0x8e, 0xfd, 0x9f,
+	0x61, 0xd8, 0xb8, 0x32, 0xbe, 0x3b, 0x7b, 0x68, 0x7f, 0x9b, 0x07, 0x8a, 0x32, 0xc6, 0x35, 0x17,
+	0xa5, 0xb2, 0x99, 0x06, 0x49, 0x0b, 0x18, 0x96, 0x61, 0x8e, 0x8e, 0xed, 0x39, 0xb6, 0x01, 0xe2,
+	0xaf, 0xe1, 0xa4, 0x73, 0xe5, 0xaa, 0x38, 0x2f, 0x60, 0xa0, 0x0c, 0x50, 0xed, 0xcf, 0x49, 0x7d,
+	0xdd, 0x56, 0xe9, 0xf8, 0xcb, 0x7f, 0x7a, 0x30, 0xb2, 0x20, 0xca, 0x7b, 0x3e, 0x43, 0xf2, 0x3d,
+	0x40, 0xfb, 0x37, 0x86, 0x9c, 0x3f, 0xd8, 0xbb, 0x76, 0xa2, 0xc7, 0xe3, 0x6d, 0x94, 0xcb, 0x1e,
+	0x7f, 0xf4, 0x85, 0x47, 0x5e, 0x6f, 0x3e, 0x41, 0xe3, 0x6d, 0x1b, 0x5c, 0x85, 0x7a, 0xba, 0x95,
+	0xdb, 0x16, 0xcb, 0xbd, 0xfb, 0x0f, 0x62, 0x75, 0x67, 0xf5, 0x61, 0xac, 0x8d, 0x91, 0xb1, 0xb1,
+	0xbe, 0x81, 0xfd, 0x6a, 0x0f, 0xc8, 0x59, 0x33, 0x04, 0x1b, 0xcb, 0x3a, 0x7e, 0xf2, 0x08, 0xef,
+	0x7c, 0xff, 0x2d, 0x04, 0xf5, 0x28, 0x92, 0xae, 0x70, 0xc3, 0x45, 0xf4, 0x98, 0xe8, 0x84, 0xb8,
+	0xea, 0x8e, 0x43, 0xf4, 0xb8, 0x35, 0x55, 0x90, 0xf3, 0x2d, 0x4c, 0x1b, 0xe5, 0xce, 0xb7, 0xff,
+	0x14, 0x7e, 0xf9, 0x7f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x14, 0xf1, 0x18, 0xaf, 0x38, 0x0a, 0x00,
+	0x00,
 }
diff --git a/vendor/vendor.json b/vendor/vendor.json
index ef4c8deb8..13ec3fe09 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -201,12 +201,12 @@
 			"revisionTime": "2017-12-31T12:27:32Z"
 		},
 		{
-			"checksumSHA1": "oUra5duKbNfxA8e++b+QbLQYYXU=",
+			"checksumSHA1": "Met8aN7K/VM9nlauhoeMvWtxZsE=",
 			"path": "gitlab.com/gitlab-org/gitaly-proto/go",
-			"revision": "e3a5c0a6da1c62f406f6b74b281dad43f8b74ea5",
-			"revisionTime": "2018-08-02T15:59:47Z",
-			"version": "v0.112.0",
-			"versionExact": "v0.112.0"
+			"revision": "881cc7e6f739bd5b796807d8ff97407968e07a2d",
+			"revisionTime": "2018-08-14T21:16:05Z",
+			"version": "v0.113.0",
+			"versionExact": "v0.113.0"
 		},
 		{
 			"checksumSHA1": "nqWNlnMmVpt628zzvyo6Yv2CX5Q=",