Update CommitDiff RPC to chunk patches over messages

13 files changed, 381 insertions, 376 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2242db64c..ee00ea951 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,8 @@ UNRELEASED
   https://gitlab.com/gitlab-org/gitaly/merge_requests/174
 - Add support for GRPC Latency Histograms in Prometheus
   https://gitlab.com/gitlab-org/gitaly/merge_requests/172
+- CommitDiff: Send chunks of patches over messages
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/170
 
 v0.10.0
 
diff --git a/internal/diff/diff.go b/internal/diff/diff.go
index 8dd2e80f1..20c84df98 100644
--- a/internal/diff/diff.go
+++ b/internal/diff/diff.go
@@ -15,15 +15,15 @@ const blankID = "0000000000000000000000000000000000000000"
 
 // 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
-	RawChunks [][]byte
+	FromID   string
+	ToID     string
+	OldMode  int32
+	NewMode  int32
+	FromPath []byte
+	ToPath   []byte
+	Binary   bool
+	Status   byte
+	Patch    []byte
 }
 
 // Parser holds necessary state for parsing a diff stream
@@ -101,8 +101,6 @@ func (parser *Parser) Parse() bool {
 		} else if bytes.HasPrefix(line, []byte("Binary")) {
 			parser.err = consumeBinaryNotice(parser.patchReader, parser.currentDiff)
 		} else if bytes.HasPrefix(line, []byte("@@")) {
-			parser.currentDiff.RawChunks = append(parser.currentDiff.RawChunks, nil)
-
 			parser.err = consumeChunkLine(parser.patchReader, parser.currentDiff)
 		} else if helper.ByteSliceHasAnyPrefix(line, "---", "+++") {
 			parser.err = consumeLine(parser.patchReader)
@@ -263,8 +261,7 @@ func consumeChunkLine(reader *bufio.Reader, diff *Diff) error {
 		return fmt.Errorf("read chunk line: %v", err)
 	}
 
-	chunkIndex := len(diff.RawChunks) - 1
-	diff.RawChunks[chunkIndex] = append(diff.RawChunks[chunkIndex], line...)
+	diff.Patch = append(diff.Patch, line...)
 
 	return nil
 }
diff --git a/internal/service/diff/commit.go b/internal/service/diff/commit.go
index 2720efb4b..96a1ab575 100644
--- a/internal/service/diff/commit.go
+++ b/internal/service/diff/commit.go
@@ -59,19 +59,43 @@ func (s *server) CommitDiff(in *pb.CommitDiffRequest, stream pb.Diff_CommitDiffS
 	}
 
 	err = eachDiff("CommitDiff", cmdArgs, func(diff *diff.Diff) error {
-		err := stream.Send(&pb.CommitDiffResponse{
-			FromPath:  diff.FromPath,
-			ToPath:    diff.ToPath,
-			FromId:    diff.FromID,
-			ToId:      diff.ToID,
-			OldMode:   diff.OldMode,
-			NewMode:   diff.NewMode,
-			Binary:    diff.Binary,
-			RawChunks: diff.RawChunks,
-		})
-
-		if err != nil {
-			return grpc.Errorf(codes.Unavailable, "CommitDiff: send: %v", err)
+		response := &pb.CommitDiffResponse{
+			FromPath: diff.FromPath,
+			ToPath:   diff.ToPath,
+			FromId:   diff.FromID,
+			ToId:     diff.ToID,
+			OldMode:  diff.OldMode,
+			NewMode:  diff.NewMode,
+			Binary:   diff.Binary,
+		}
+
+		if len(diff.Patch) <= s.MsgSizeThreshold {
+			response.RawPatchData = diff.Patch
+			response.EndOfPatch = true
+
+			if err := stream.Send(response); err != nil {
+				return grpc.Errorf(codes.Unavailable, "CommitDiff: send: %v", err)
+			}
+		} else {
+			patch := diff.Patch
+
+			for len(patch) > 0 {
+				if len(patch) > s.MsgSizeThreshold {
+					response.RawPatchData = patch[:s.MsgSizeThreshold]
+					patch = patch[s.MsgSizeThreshold:]
+				} else {
+					response.RawPatchData = patch
+					response.EndOfPatch = true
+					patch = nil
+				}
+
+				if err := stream.Send(response); err != nil {
+					return grpc.Errorf(codes.Unavailable, "CommitDiff: send: %v", err)
+				}
+
+				// Use a new response so we don't send other fields (FromPath, ...) over and over
+				response = &pb.CommitDiffResponse{}
+			}
 		}
 
 		return nil
diff --git a/internal/service/diff/commit_test.go b/internal/service/diff/commit_test.go
index 24f573e5f..544f1c0f8 100644
--- a/internal/service/diff/commit_test.go
+++ b/internal/service/diff/commit_test.go
@@ -20,11 +20,6 @@ import (
 
 var serverSocketPath = path.Join(scratchDir, "gitaly.sock")
 
-type expectedDiff struct {
-	diff.Diff
-	ChunksCombined []byte
-}
-
 func TestSuccessfulCommitDiffRequest(t *testing.T) {
 	server := runDiffServer(t)
 	defer server.Stop()
@@ -40,146 +35,122 @@ func TestSuccessfulCommitDiffRequest(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	expectedDiffs := []expectedDiff{
-		{
-			Diff: diff.Diff{
-				FromID:   "faaf198af3a36dbf41961466703cc1d47c61d051",
-				ToID:     "877cee6ab11f9094e1bcdb7f1fd9c0001b572185",
-				OldMode:  0100644,
-				NewMode:  0100644,
-				FromPath: []byte("README.md"),
-				ToPath:   []byte("README.md"),
-				Binary:   false,
-			},
-			ChunksCombined: testhelper.MustReadFile(t, "testdata/readme-md-chunks.txt"),
-		},
-		{
-			Diff: diff.Diff{
-				FromID:   "bdea48ee65c869eb0b86b1283069d76cce0a7254",
-				ToID:     "0000000000000000000000000000000000000000",
-				OldMode:  0100644,
-				NewMode:  0,
-				FromPath: []byte("gitaly/deleted-file"),
-				ToPath:   []byte("gitaly/deleted-file"),
-				Binary:   false,
-			},
-			ChunksCombined: testhelper.MustReadFile(t, "testdata/deleted-file-chunks.txt"),
-		},
-		{
-			Diff: diff.Diff{
-				FromID:   "aa408b4556e594f7974390ad6b86210617fbda6e",
-				ToID:     "1c69c4d2a65ad05c24ac3b6780b5748b97ffd3aa",
-				OldMode:  0100644,
-				NewMode:  0100644,
-				FromPath: []byte("gitaly/file-with-multiple-chunks"),
-				ToPath:   []byte("gitaly/file-with-multiple-chunks"),
-				Binary:   false,
-			},
-			ChunksCombined: testhelper.MustReadFile(t, "testdata/file-with-multiple-chunks-chunks.txt"),
-		},
-		{
-			Diff: diff.Diff{
-				FromID:   "0000000000000000000000000000000000000000",
-				ToID:     "bc2ef601a538d69ef99d5bdafa605e63f902e8e4",
-				OldMode:  0,
-				NewMode:  0100644,
-				FromPath: []byte("gitaly/logo-white.png"),
-				ToPath:   []byte("gitaly/logo-white.png"),
-				Binary:   true,
-			},
-		},
-		{
-			Diff: diff.Diff{
-				FromID:   "ead5a0eee1391308803cfebd8a2a8530495645eb",
-				ToID:     "ead5a0eee1391308803cfebd8a2a8530495645eb",
-				OldMode:  0100644,
-				NewMode:  0100755,
-				FromPath: []byte("gitaly/mode-file"),
-				ToPath:   []byte("gitaly/mode-file"),
-				Binary:   false,
-			},
-		},
-		{
-			Diff: diff.Diff{
-				FromID:   "357406f3075a57708d0163752905cc1576fceacc",
-				ToID:     "8e5177d718c561d36efde08bad36b43687ee6bf0",
-				OldMode:  0100644,
-				NewMode:  0100755,
-				FromPath: []byte("gitaly/mode-file-with-mods"),
-				ToPath:   []byte("gitaly/mode-file-with-mods"),
-				Binary:   false,
-			},
-			ChunksCombined: testhelper.MustReadFile(t, "testdata/mode-file-with-mods-chunks.txt"),
-		},
-		{
-			Diff: diff.Diff{
-				FromID:   "43d24af4e22580f36b1ca52647c1aff75a766a33",
-				ToID:     "0000000000000000000000000000000000000000",
-				OldMode:  0100644,
-				NewMode:  0,
-				FromPath: []byte("gitaly/named-file-with-mods"),
-				ToPath:   []byte("gitaly/named-file-with-mods"),
-				Binary:   false,
-			},
-			ChunksCombined: testhelper.MustReadFile(t, "testdata/named-file-with-mods-chunks.txt"),
-		},
-		{
-			Diff: diff.Diff{
-				FromID:   "0000000000000000000000000000000000000000",
-				ToID:     "b464dff7a75ccc92fbd920fd9ae66a84b9d2bf94",
-				OldMode:  0,
-				NewMode:  0100644,
-				FromPath: []byte("gitaly/no-newline-at-the-end"),
-				ToPath:   []byte("gitaly/no-newline-at-the-end"),
-				Binary:   false,
-			},
-			ChunksCombined: testhelper.MustReadFile(t, "testdata/no-newline-at-the-end-chunks.txt"),
-		},
-		{
-			Diff: diff.Diff{
-				FromID:   "4e76e90b3c7e52390de9311a23c0a77575aed8a8",
-				ToID:     "4e76e90b3c7e52390de9311a23c0a77575aed8a8",
-				OldMode:  0100644,
-				NewMode:  0100644,
-				FromPath: []byte("gitaly/named-file"),
-				ToPath:   []byte("gitaly/renamed-file"),
-				Binary:   false,
-			},
-		},
-		{
-			Diff: diff.Diff{
-				FromID:   "0000000000000000000000000000000000000000",
-				ToID:     "3856c00e9450a51a62096327167fc43d3be62eef",
-				OldMode:  0,
-				NewMode:  0100644,
-				FromPath: []byte("gitaly/renamed-file-with-mods"),
-				ToPath:   []byte("gitaly/renamed-file-with-mods"),
-				Binary:   false,
-			},
-			ChunksCombined: testhelper.MustReadFile(t, "testdata/renamed-file-with-mods-chunks.txt"),
-		},
-		{
-			Diff: diff.Diff{
-				FromID:   "0000000000000000000000000000000000000000",
-				ToID:     "a135e3e0d4af177a902ca57dcc4c7fc6f30858b1",
-				OldMode:  0,
-				NewMode:  0100644,
-				FromPath: []byte("gitaly/tab\tnewline\n file"),
-				ToPath:   []byte("gitaly/tab\tnewline\n file"),
-				Binary:   false,
-			},
-			ChunksCombined: testhelper.MustReadFile(t, "testdata/tab-newline-file-chunks.txt"),
-		},
-		{
-			Diff: diff.Diff{
-				FromID:   "0000000000000000000000000000000000000000",
-				ToID:     "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
-				OldMode:  0,
-				NewMode:  0100755,
-				FromPath: []byte("gitaly/テスト.txt"),
-				ToPath:   []byte("gitaly/テスト.txt"),
-				Binary:   false,
-			},
+	expectedDiffs := []diff.Diff{
+		{
+			FromID:   "faaf198af3a36dbf41961466703cc1d47c61d051",
+			ToID:     "877cee6ab11f9094e1bcdb7f1fd9c0001b572185",
+			OldMode:  0100644,
+			NewMode:  0100644,
+			FromPath: []byte("README.md"),
+			ToPath:   []byte("README.md"),
+			Binary:   false,
+			Patch:    testhelper.MustReadFile(t, "testdata/readme-md-chunks.txt"),
+		},
+		{
+			FromID:   "bdea48ee65c869eb0b86b1283069d76cce0a7254",
+			ToID:     "0000000000000000000000000000000000000000",
+			OldMode:  0100644,
+			NewMode:  0,
+			FromPath: []byte("gitaly/deleted-file"),
+			ToPath:   []byte("gitaly/deleted-file"),
+			Binary:   false,
+			Patch:    testhelper.MustReadFile(t, "testdata/deleted-file-chunks.txt"),
+		},
+		{
+			FromID:   "aa408b4556e594f7974390ad6b86210617fbda6e",
+			ToID:     "1c69c4d2a65ad05c24ac3b6780b5748b97ffd3aa",
+			OldMode:  0100644,
+			NewMode:  0100644,
+			FromPath: []byte("gitaly/file-with-multiple-chunks"),
+			ToPath:   []byte("gitaly/file-with-multiple-chunks"),
+			Binary:   false,
+			Patch:    testhelper.MustReadFile(t, "testdata/file-with-multiple-chunks-chunks.txt"),
+		},
+		{
+			FromID:   "0000000000000000000000000000000000000000",
+			ToID:     "bc2ef601a538d69ef99d5bdafa605e63f902e8e4",
+			OldMode:  0,
+			NewMode:  0100644,
+			FromPath: []byte("gitaly/logo-white.png"),
+			ToPath:   []byte("gitaly/logo-white.png"),
+			Binary:   true,
+		},
+		{
+			FromID:   "ead5a0eee1391308803cfebd8a2a8530495645eb",
+			ToID:     "ead5a0eee1391308803cfebd8a2a8530495645eb",
+			OldMode:  0100644,
+			NewMode:  0100755,
+			FromPath: []byte("gitaly/mode-file"),
+			ToPath:   []byte("gitaly/mode-file"),
+			Binary:   false,
+		},
+		{
+			FromID:   "357406f3075a57708d0163752905cc1576fceacc",
+			ToID:     "8e5177d718c561d36efde08bad36b43687ee6bf0",
+			OldMode:  0100644,
+			NewMode:  0100755,
+			FromPath: []byte("gitaly/mode-file-with-mods"),
+			ToPath:   []byte("gitaly/mode-file-with-mods"),
+			Binary:   false,
+			Patch:    testhelper.MustReadFile(t, "testdata/mode-file-with-mods-chunks.txt"),
+		},
+		{
+			FromID:   "43d24af4e22580f36b1ca52647c1aff75a766a33",
+			ToID:     "0000000000000000000000000000000000000000",
+			OldMode:  0100644,
+			NewMode:  0,
+			FromPath: []byte("gitaly/named-file-with-mods"),
+			ToPath:   []byte("gitaly/named-file-with-mods"),
+			Binary:   false,
+			Patch:    testhelper.MustReadFile(t, "testdata/named-file-with-mods-chunks.txt"),
+		},
+		{
+			FromID:   "0000000000000000000000000000000000000000",
+			ToID:     "b464dff7a75ccc92fbd920fd9ae66a84b9d2bf94",
+			OldMode:  0,
+			NewMode:  0100644,
+			FromPath: []byte("gitaly/no-newline-at-the-end"),
+			ToPath:   []byte("gitaly/no-newline-at-the-end"),
+			Binary:   false,
+			Patch:    testhelper.MustReadFile(t, "testdata/no-newline-at-the-end-chunks.txt"),
+		},
+		{
+			FromID:   "4e76e90b3c7e52390de9311a23c0a77575aed8a8",
+			ToID:     "4e76e90b3c7e52390de9311a23c0a77575aed8a8",
+			OldMode:  0100644,
+			NewMode:  0100644,
+			FromPath: []byte("gitaly/named-file"),
+			ToPath:   []byte("gitaly/renamed-file"),
+			Binary:   false,
+		},
+		{
+			FromID:   "0000000000000000000000000000000000000000",
+			ToID:     "3856c00e9450a51a62096327167fc43d3be62eef",
+			OldMode:  0,
+			NewMode:  0100644,
+			FromPath: []byte("gitaly/renamed-file-with-mods"),
+			ToPath:   []byte("gitaly/renamed-file-with-mods"),
+			Binary:   false,
+			Patch:    testhelper.MustReadFile(t, "testdata/renamed-file-with-mods-chunks.txt"),
+		},
+		{
+			FromID:   "0000000000000000000000000000000000000000",
+			ToID:     "a135e3e0d4af177a902ca57dcc4c7fc6f30858b1",
+			OldMode:  0,
+			NewMode:  0100644,
+			FromPath: []byte("gitaly/tab\tnewline\n file"),
+			ToPath:   []byte("gitaly/tab\tnewline\n file"),
+			Binary:   false,
+			Patch:    testhelper.MustReadFile(t, "testdata/tab-newline-file-chunks.txt"),
+		},
+		{
+			FromID:   "0000000000000000000000000000000000000000",
+			ToID:     "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
+			OldMode:  0,
+			NewMode:  0100755,
+			FromPath: []byte("gitaly/テスト.txt"),
+			ToPath:   []byte("gitaly/テスト.txt"),
+			Binary:   false,
 		},
 	}
 
@@ -212,54 +183,46 @@ func TestSuccessfulCommitDiffRequestWithPaths(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	expectedDiffs := []expectedDiff{
-		{
-			Diff: diff.Diff{
-				FromID:   "c1788657b95998a2f177a4f86d68a60f2a80117f",
-				ToID:     "b87f61fe2d7b2e208b340a1f3cafea916bd27f75",
-				OldMode:  0100644,
-				NewMode:  0100644,
-				FromPath: []byte("CONTRIBUTING.md"),
-				ToPath:   []byte("CONTRIBUTING.md"),
-				Binary:   false,
-			},
-			ChunksCombined: testhelper.MustReadFile(t, "testdata/contributing-md-chunks.txt"),
-		},
-		{
-			Diff: diff.Diff{
-				FromID:   "faaf198af3a36dbf41961466703cc1d47c61d051",
-				ToID:     "877cee6ab11f9094e1bcdb7f1fd9c0001b572185",
-				OldMode:  0100644,
-				NewMode:  0100644,
-				FromPath: []byte("README.md"),
-				ToPath:   []byte("README.md"),
-				Binary:   false,
-			},
-			ChunksCombined: testhelper.MustReadFile(t, "testdata/readme-md-chunks.txt"),
-		},
-		{
-			Diff: diff.Diff{
-				FromID:   "357406f3075a57708d0163752905cc1576fceacc",
-				ToID:     "8e5177d718c561d36efde08bad36b43687ee6bf0",
-				OldMode:  0100644,
-				NewMode:  0100755,
-				FromPath: []byte("gitaly/mode-file-with-mods"),
-				ToPath:   []byte("gitaly/mode-file-with-mods"),
-				Binary:   false,
-			},
-			ChunksCombined: testhelper.MustReadFile(t, "testdata/mode-file-with-mods-chunks.txt"),
-		},
-		{
-			Diff: diff.Diff{
-				FromID:   "43d24af4e22580f36b1ca52647c1aff75a766a33",
-				ToID:     "0000000000000000000000000000000000000000",
-				OldMode:  0100644,
-				NewMode:  0,
-				FromPath: []byte("gitaly/named-file-with-mods"),
-				ToPath:   []byte("gitaly/named-file-with-mods"),
-				Binary:   false,
-			},
-			ChunksCombined: testhelper.MustReadFile(t, "testdata/named-file-with-mods-chunks.txt"),
+	expectedDiffs := []diff.Diff{
+		{
+			FromID:   "c1788657b95998a2f177a4f86d68a60f2a80117f",
+			ToID:     "b87f61fe2d7b2e208b340a1f3cafea916bd27f75",
+			OldMode:  0100644,
+			NewMode:  0100644,
+			FromPath: []byte("CONTRIBUTING.md"),
+			ToPath:   []byte("CONTRIBUTING.md"),
+			Binary:   false,
+			Patch:    testhelper.MustReadFile(t, "testdata/contributing-md-chunks.txt"),
+		},
+		{
+			FromID:   "faaf198af3a36dbf41961466703cc1d47c61d051",
+			ToID:     "877cee6ab11f9094e1bcdb7f1fd9c0001b572185",
+			OldMode:  0100644,
+			NewMode:  0100644,
+			FromPath: []byte("README.md"),
+			ToPath:   []byte("README.md"),
+			Binary:   false,
+			Patch:    testhelper.MustReadFile(t, "testdata/readme-md-chunks.txt"),
+		},
+		{
+			FromID:   "357406f3075a57708d0163752905cc1576fceacc",
+			ToID:     "8e5177d718c561d36efde08bad36b43687ee6bf0",
+			OldMode:  0100644,
+			NewMode:  0100755,
+			FromPath: []byte("gitaly/mode-file-with-mods"),
+			ToPath:   []byte("gitaly/mode-file-with-mods"),
+			Binary:   false,
+			Patch:    testhelper.MustReadFile(t, "testdata/mode-file-with-mods-chunks.txt"),
+		},
+		{
+			FromID:   "43d24af4e22580f36b1ca52647c1aff75a766a33",
+			ToID:     "0000000000000000000000000000000000000000",
+			OldMode:  0100644,
+			NewMode:  0,
+			FromPath: []byte("gitaly/named-file-with-mods"),
+			ToPath:   []byte("gitaly/named-file-with-mods"),
+			Binary:   false,
+			Patch:    testhelper.MustReadFile(t, "testdata/named-file-with-mods-chunks.txt"),
 		},
 	}
 
@@ -285,30 +248,26 @@ func TestSuccessfulCommitDiffRequestWithTypeChangeDiff(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	expectedDiffs := []expectedDiff{
+	expectedDiffs := []diff.Diff{
 		{
-			Diff: diff.Diff{
-				FromID:   "349cd0f6b1aba8538861d95783cbce6d49d747f8",
-				ToID:     "0000000000000000000000000000000000000000",
-				OldMode:  0120000,
-				NewMode:  0,
-				FromPath: []byte("gitaly/symlink-to-be-regular"),
-				ToPath:   []byte("gitaly/symlink-to-be-regular"),
-				Binary:   false,
-			},
-			ChunksCombined: testhelper.MustReadFile(t, "testdata/symlink-to-be-regular-deleted-chunks.txt"),
+			FromID:   "349cd0f6b1aba8538861d95783cbce6d49d747f8",
+			ToID:     "0000000000000000000000000000000000000000",
+			OldMode:  0120000,
+			NewMode:  0,
+			FromPath: []byte("gitaly/symlink-to-be-regular"),
+			ToPath:   []byte("gitaly/symlink-to-be-regular"),
+			Binary:   false,
+			Patch:    testhelper.MustReadFile(t, "testdata/symlink-to-be-regular-deleted-chunks.txt"),
 		},
 		{
-			Diff: diff.Diff{
-				FromID:   "0000000000000000000000000000000000000000",
-				ToID:     "f9e5cc857610185e6feeb494a26bf27551a4f02b",
-				OldMode:  0,
-				NewMode:  0100644,
-				FromPath: []byte("gitaly/symlink-to-be-regular"),
-				ToPath:   []byte("gitaly/symlink-to-be-regular"),
-				Binary:   false,
-			},
-			ChunksCombined: testhelper.MustReadFile(t, "testdata/symlink-to-be-regular-added-chunks.txt"),
+			FromID:   "0000000000000000000000000000000000000000",
+			ToID:     "f9e5cc857610185e6feeb494a26bf27551a4f02b",
+			OldMode:  0,
+			NewMode:  0100644,
+			FromPath: []byte("gitaly/symlink-to-be-regular"),
+			ToPath:   []byte("gitaly/symlink-to-be-regular"),
+			Binary:   false,
+			Patch:    testhelper.MustReadFile(t, "testdata/symlink-to-be-regular-added-chunks.txt"),
 		},
 	}
 
@@ -334,71 +293,61 @@ func TestSuccessfulCommitDiffRequestWithIgnoreWhitespaceChange(t *testing.T) {
 		[]byte("gitaly/mode-file-with-mods"),
 	}
 
-	expectedWhitespaceDiffs := []expectedDiff{
-		{
-			Diff: diff.Diff{
-				FromID:   "c1788657b95998a2f177a4f86d68a60f2a80117f",
-				ToID:     "b87f61fe2d7b2e208b340a1f3cafea916bd27f75",
-				OldMode:  0100644,
-				NewMode:  0100644,
-				FromPath: []byte("CONTRIBUTING.md"),
-				ToPath:   []byte("CONTRIBUTING.md"),
-				Binary:   false,
-			},
-		},
-		{
-			Diff: diff.Diff{
-				FromID:   "95d9f0a5e7bb054e9dd3975589b8dfc689e20e88",
-				ToID:     "5d9c7c0470bf368d61d9b6cd076300dc9d061f14",
-				OldMode:  0100644,
-				NewMode:  0100644,
-				FromPath: []byte("MAINTENANCE.md"),
-				ToPath:   []byte("MAINTENANCE.md"),
-				Binary:   false,
-			},
-		},
-		{
-			Diff: diff.Diff{
-				FromID:   "faaf198af3a36dbf41961466703cc1d47c61d051",
-				ToID:     "877cee6ab11f9094e1bcdb7f1fd9c0001b572185",
-				OldMode:  0100644,
-				NewMode:  0100644,
-				FromPath: []byte("README.md"),
-				ToPath:   []byte("README.md"),
-				Binary:   false,
-			},
-		},
-	}
-	expectedNormalDiffs := []expectedDiff{
-		{
-			Diff: diff.Diff{
-				FromID:   "357406f3075a57708d0163752905cc1576fceacc",
-				ToID:     "8e5177d718c561d36efde08bad36b43687ee6bf0",
-				OldMode:  0100644,
-				NewMode:  0100755,
-				FromPath: []byte("gitaly/mode-file-with-mods"),
-				ToPath:   []byte("gitaly/mode-file-with-mods"),
-				Binary:   false,
-			},
-			ChunksCombined: testhelper.MustReadFile(t, "testdata/mode-file-with-mods-chunks.txt"),
-		},
-		{
-			Diff: diff.Diff{
-				FromID:   "43d24af4e22580f36b1ca52647c1aff75a766a33",
-				ToID:     "0000000000000000000000000000000000000000",
-				OldMode:  0100644,
-				NewMode:  0,
-				FromPath: []byte("gitaly/named-file-with-mods"),
-				ToPath:   []byte("gitaly/named-file-with-mods"),
-				Binary:   false,
-			},
-			ChunksCombined: testhelper.MustReadFile(t, "testdata/named-file-with-mods-chunks.txt"),
+	expectedWhitespaceDiffs := []diff.Diff{
+		{
+			FromID:   "c1788657b95998a2f177a4f86d68a60f2a80117f",
+			ToID:     "b87f61fe2d7b2e208b340a1f3cafea916bd27f75",
+			OldMode:  0100644,
+			NewMode:  0100644,
+			FromPath: []byte("CONTRIBUTING.md"),
+			ToPath:   []byte("CONTRIBUTING.md"),
+			Binary:   false,
+		},
+		{
+			FromID:   "95d9f0a5e7bb054e9dd3975589b8dfc689e20e88",
+			ToID:     "5d9c7c0470bf368d61d9b6cd076300dc9d061f14",
+			OldMode:  0100644,
+			NewMode:  0100644,
+			FromPath: []byte("MAINTENANCE.md"),
+			ToPath:   []byte("MAINTENANCE.md"),
+			Binary:   false,
+		},
+		{
+			FromID:   "faaf198af3a36dbf41961466703cc1d47c61d051",
+			ToID:     "877cee6ab11f9094e1bcdb7f1fd9c0001b572185",
+			OldMode:  0100644,
+			NewMode:  0100644,
+			FromPath: []byte("README.md"),
+			ToPath:   []byte("README.md"),
+			Binary:   false,
+		},
+	}
+	expectedNormalDiffs := []diff.Diff{
+		{
+			FromID:   "357406f3075a57708d0163752905cc1576fceacc",
+			ToID:     "8e5177d718c561d36efde08bad36b43687ee6bf0",
+			OldMode:  0100644,
+			NewMode:  0100755,
+			FromPath: []byte("gitaly/mode-file-with-mods"),
+			ToPath:   []byte("gitaly/mode-file-with-mods"),
+			Binary:   false,
+			Patch:    testhelper.MustReadFile(t, "testdata/mode-file-with-mods-chunks.txt"),
+		},
+		{
+			FromID:   "43d24af4e22580f36b1ca52647c1aff75a766a33",
+			ToID:     "0000000000000000000000000000000000000000",
+			OldMode:  0100644,
+			NewMode:  0,
+			FromPath: []byte("gitaly/named-file-with-mods"),
+			ToPath:   []byte("gitaly/named-file-with-mods"),
+			Binary:   false,
+			Patch:    testhelper.MustReadFile(t, "testdata/named-file-with-mods-chunks.txt"),
 		},
 	}
 
 	pathsAndDiffs := []struct {
 		paths [][]byte
-		diffs []expectedDiff
+		diffs []diff.Diff
 	}{
 		{
 			paths: whitespacePaths,
@@ -754,8 +703,10 @@ func drainCommitDeltaResponse(c pb.Diff_CommitDeltaClient) error {
 	return nil
 }
 
-func assertExactReceivedDiffs(t *testing.T, client pb.Diff_CommitDiffClient, expectedDiffs []expectedDiff) {
-	i := 0
+func getDiffsFromCommitDiffClient(t *testing.T, client pb.Diff_CommitDiffClient) []*diff.Diff {
+	var diffs []*diff.Diff
+	var currentDiff *diff.Diff
+
 	for {
 		fetchedDiff, err := client.Recv()
 		if err == io.EOF {
@@ -764,6 +715,37 @@ func assertExactReceivedDiffs(t *testing.T, client pb.Diff_CommitDiffClient, exp
 			t.Fatal(err)
 		}
 
+		if currentDiff == nil {
+			currentDiff = &diff.Diff{
+				FromID:   fetchedDiff.FromId,
+				ToID:     fetchedDiff.ToId,
+				OldMode:  fetchedDiff.OldMode,
+				NewMode:  fetchedDiff.NewMode,
+				FromPath: fetchedDiff.FromPath,
+				ToPath:   fetchedDiff.ToPath,
+				Binary:   fetchedDiff.Binary,
+				Patch:    fetchedDiff.RawPatchData,
+			}
+		} else {
+			currentDiff.Patch = append(currentDiff.Patch, fetchedDiff.RawPatchData...)
+		}
+
+		if fetchedDiff.EndOfPatch {
+			diffs = append(diffs, currentDiff)
+			currentDiff = nil
+		}
+	}
+
+	return diffs
+}
+
+func assertExactReceivedDiffs(t *testing.T, client pb.Diff_CommitDiffClient, expectedDiffs []diff.Diff) {
+	fetchedDiffs := getDiffsFromCommitDiffClient(t, client)
+
+	var i int
+	var fetchedDiff *diff.Diff
+
+	for i, fetchedDiff = range fetchedDiffs {
 		if i >= len(expectedDiffs) {
 			t.Errorf("Unexpected diff #%d received: %v", i, fetchedDiff)
 			break
@@ -771,12 +753,12 @@ func assertExactReceivedDiffs(t *testing.T, client pb.Diff_CommitDiffClient, exp
 
 		expectedDiff := expectedDiffs[i]
 
-		if expectedDiff.FromID != fetchedDiff.FromId {
-			t.Errorf("Expected diff #%d FromID to equal = %q, got %q", i, expectedDiff.FromID, fetchedDiff.FromId)
+		if expectedDiff.FromID != fetchedDiff.FromID {
+			t.Errorf("Expected diff #%d FromID to equal = %q, got %q", i, expectedDiff.FromID, fetchedDiff.FromID)
 		}
 
-		if expectedDiff.ToID != fetchedDiff.ToId {
-			t.Errorf("Expected diff #%d ToID to equal = %q, got %q", i, expectedDiff.ToID, fetchedDiff.ToId)
+		if expectedDiff.ToID != fetchedDiff.ToID {
+			t.Errorf("Expected diff #%d ToID to equal = %q, got %q", i, expectedDiff.ToID, fetchedDiff.ToID)
 		}
 
 		if expectedDiff.OldMode != fetchedDiff.OldMode {
@@ -799,16 +781,13 @@ func assertExactReceivedDiffs(t *testing.T, client pb.Diff_CommitDiffClient, exp
 			t.Errorf("Expected diff #%d Binary to be %t, got %t", i, expectedDiff.Binary, fetchedDiff.Binary)
 		}
 
-		fetchedChunksCombined := bytes.Join(fetchedDiff.RawChunks, nil)
-		if !bytes.Equal(expectedDiff.ChunksCombined, fetchedChunksCombined) {
-			t.Errorf("Expected diff #%d Chunks to be %q, got %q", i, expectedDiff.ChunksCombined, fetchedChunksCombined)
+		if !bytes.Equal(expectedDiff.Patch, fetchedDiff.Patch) {
+			t.Errorf("Expected diff #%d Chunks to be %q, got %q", i, expectedDiff.Patch, fetchedDiff.Patch)
 		}
-
-		i++
 	}
 
-	if len(expectedDiffs) != i {
-		t.Errorf("Expected number of diffs to be %d, got %d", len(expectedDiffs), i)
+	if len(expectedDiffs) != i+1 {
+		t.Errorf("Expected number of diffs to be %d, got %d", len(expectedDiffs), i+1)
 	}
 }
 
diff --git a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION
index faef31a43..a3df0a695 100644
--- a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION
+++ b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION
@@ -1 +1 @@
-0.7.0
+0.8.0
diff --git a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/commit.pb.go b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/commit.pb.go
index 756c122cf..902aaa902 100644
--- a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/commit.pb.go
+++ b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/commit.pb.go
@@ -1,6 +1,5 @@
-// Code generated by protoc-gen-go.
+// Code generated by protoc-gen-go. DO NOT EDIT.
 // source: commit.proto
-// DO NOT EDIT!
 
 /*
 Package gitaly is a generated protocol buffer package.
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 30a729285..737e54216 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
@@ -1,6 +1,5 @@
-// Code generated by protoc-gen-go.
+// Code generated by protoc-gen-go. DO NOT EDIT.
 // source: diff.proto
-// DO NOT EDIT!
 
 package gitaly
 
@@ -71,12 +70,13 @@ type CommitDiffResponse struct {
 	FromPath []byte `protobuf:"bytes,1,opt,name=from_path,json=fromPath,proto3" json:"from_path,omitempty"`
 	ToPath   []byte `protobuf:"bytes,2,opt,name=to_path,json=toPath,proto3" json:"to_path,omitempty"`
 	// Blob ID as returned via `git diff --full-index`
-	FromId    string   `protobuf:"bytes,3,opt,name=from_id,json=fromId" json:"from_id,omitempty"`
-	ToId      string   `protobuf:"bytes,4,opt,name=to_id,json=toId" json:"to_id,omitempty"`
-	OldMode   int32    `protobuf:"varint,5,opt,name=old_mode,json=oldMode" json:"old_mode,omitempty"`
-	NewMode   int32    `protobuf:"varint,6,opt,name=new_mode,json=newMode" json:"new_mode,omitempty"`
-	Binary    bool     `protobuf:"varint,7,opt,name=binary" json:"binary,omitempty"`
-	RawChunks [][]byte `protobuf:"bytes,8,rep,name=raw_chunks,json=rawChunks,proto3" json:"raw_chunks,omitempty"`
+	FromId       string `protobuf:"bytes,3,opt,name=from_id,json=fromId" json:"from_id,omitempty"`
+	ToId         string `protobuf:"bytes,4,opt,name=to_id,json=toId" json:"to_id,omitempty"`
+	OldMode      int32  `protobuf:"varint,5,opt,name=old_mode,json=oldMode" json:"old_mode,omitempty"`
+	NewMode      int32  `protobuf:"varint,6,opt,name=new_mode,json=newMode" json:"new_mode,omitempty"`
+	Binary       bool   `protobuf:"varint,7,opt,name=binary" json:"binary,omitempty"`
+	RawPatchData []byte `protobuf:"bytes,9,opt,name=raw_patch_data,json=rawPatchData,proto3" json:"raw_patch_data,omitempty"`
+	EndOfPatch   bool   `protobuf:"varint,10,opt,name=end_of_patch,json=endOfPatch" json:"end_of_patch,omitempty"`
 }
 
 func (m *CommitDiffResponse) Reset()                    { *m = CommitDiffResponse{} }
@@ -133,13 +133,20 @@ func (m *CommitDiffResponse) GetBinary() bool {
 	return false
 }
 
-func (m *CommitDiffResponse) GetRawChunks() [][]byte {
+func (m *CommitDiffResponse) GetRawPatchData() []byte {
 	if m != nil {
-		return m.RawChunks
+		return m.RawPatchData
 	}
 	return nil
 }
 
+func (m *CommitDiffResponse) GetEndOfPatch() bool {
+	if m != nil {
+		return m.EndOfPatch
+	}
+	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"`
@@ -272,7 +279,7 @@ const _ = grpc.SupportPackageIsVersion4
 // Client API for Diff service
 
 type DiffClient interface {
-	// Returns stream of CommitDiffResponse: 1 per changed file
+	// Returns stream of CommitDiffResponse with patches chunked over messages
 	CommitDiff(ctx context.Context, in *CommitDiffRequest, opts ...grpc.CallOption) (Diff_CommitDiffClient, error)
 	// Return a stream so we can divide the response in chunks of deltas
 	CommitDelta(ctx context.Context, in *CommitDeltaRequest, opts ...grpc.CallOption) (Diff_CommitDeltaClient, error)
@@ -353,7 +360,7 @@ func (x *diffCommitDeltaClient) Recv() (*CommitDeltaResponse, error) {
 // Server API for Diff service
 
 type DiffServer interface {
-	// Returns stream of CommitDiffResponse: 1 per changed file
+	// Returns stream of CommitDiffResponse with patches chunked over messages
 	CommitDiff(*CommitDiffRequest, Diff_CommitDiffServer) error
 	// Return a stream so we can divide the response in chunks of deltas
 	CommitDelta(*CommitDeltaRequest, Diff_CommitDeltaServer) error
@@ -427,33 +434,35 @@ var _Diff_serviceDesc = grpc.ServiceDesc{
 func init() { proto.RegisterFile("diff.proto", fileDescriptor1) }
 
 var fileDescriptor1 = []byte{
-	// 446 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x94, 0xd1, 0x8a, 0x13, 0x31,
-	0x14, 0x86, 0xcd, 0x76, 0x66, 0xda, 0x9e, 0x56, 0xc5, 0x54, 0xd6, 0x6c, 0x17, 0x61, 0x28, 0x22,
-	0x03, 0x42, 0x91, 0x7a, 0xe3, 0xb5, 0x15, 0xa4, 0x82, 0x20, 0xb9, 0xf1, 0x72, 0xc8, 0x36, 0x99,
-	0x4e, 0x70, 0x3a, 0x19, 0x93, 0x2c, 0x43, 0x9f, 0xc5, 0x07, 0xf0, 0xc6, 0xd7, 0xf2, 0x3d, 0x24,
-	0x49, 0x77, 0x3a, 0xbb, 0xf4, 0x01, 0xf6, 0x32, 0xff, 0xf7, 0xe7, 0x24, 0x7f, 0xce, 0x99, 0x01,
-	0xe0, 0xb2, 0x28, 0x96, 0x8d, 0x56, 0x56, 0xe1, 0x64, 0x27, 0x2d, 0xab, 0x0e, 0xf3, 0xa9, 0x29,
-	0x99, 0x16, 0x3c, 0xa8, 0x8b, 0x7f, 0x08, 0x5e, 0xac, 0xd5, 0x7e, 0x2f, 0xed, 0x67, 0x59, 0x14,
-	0x54, 0xfc, 0xba, 0x15, 0xc6, 0xe2, 0x15, 0x80, 0x16, 0x8d, 0x32, 0xd2, 0x2a, 0x7d, 0x20, 0x28,
-	0x45, 0xd9, 0x64, 0x85, 0x97, 0xa1, 0xc0, 0x92, 0x76, 0x84, 0xf6, 0x5c, 0xf8, 0x0d, 0x3c, 0xab,
-	0x44, 0x61, 0xf3, 0xad, 0xaf, 0x96, 0x4b, 0x4e, 0x2e, 0x52, 0x94, 0x8d, 0xe9, 0xd4, 0xa9, 0xe1,
-	0x88, 0x0d, 0xc7, 0x6f, 0xe1, 0xb9, 0x96, 0xbb, 0xb2, 0x6f, 0x1b, 0x78, 0xdb, 0x53, 0x2f, 0x77,
-	0xbe, 0x8f, 0x40, 0xe4, 0xae, 0x56, 0x5a, 0xe4, 0x6d, 0x29, 0xad, 0x30, 0x0d, 0xdb, 0x8a, 0x7c,
-	0x5b, 0xb2, 0x7a, 0x27, 0x48, 0x94, 0xa2, 0x6c, 0x44, 0x2f, 0x03, 0xff, 0xd1, 0xe1, 0xb5, 0xa7,
-	0xf8, 0x25, 0xc4, 0x0d, 0xb3, 0xa5, 0x21, 0x71, 0x3a, 0xc8, 0xa6, 0x34, 0x2c, 0x5c, 0x4e, 0xdc,
-	0xcf, 0x69, 0x1a, 0x55, 0x1b, 0x81, 0xaf, 0x61, 0x5c, 0x68, 0xb5, 0xcf, 0x9d, 0xc9, 0xe7, 0x9c,
-	0xd2, 0x91, 0x13, 0xbe, 0x33, 0x5b, 0xe2, 0x57, 0x30, 0xb4, 0x2a, 0xa0, 0x0b, 0x8f, 0x12, 0xab,
-	0xee, 0x80, 0xdf, 0xd5, 0x5d, 0x3e, 0x71, 0xcb, 0x0d, 0xc7, 0x33, 0x88, 0xad, 0x72, 0x72, 0xe4,
-	0xe5, 0xc8, 0xaa, 0x0d, 0xc7, 0x57, 0x30, 0x52, 0x15, 0xcf, 0xf7, 0x8a, 0x0b, 0x12, 0xa7, 0x28,
-	0x8b, 0xe9, 0x50, 0x55, 0xfc, 0x9b, 0xe2, 0xc2, 0xa1, 0x5a, 0xb4, 0x01, 0x25, 0x01, 0xd5, 0xa2,
-	0xf5, 0xe8, 0x12, 0x92, 0x1b, 0x59, 0x33, 0x7d, 0x20, 0x43, 0x1f, 0xf7, 0xb8, 0xc2, 0xaf, 0x01,
-	0x34, 0x6b, 0xf3, 0x6d, 0x79, 0x5b, 0xff, 0x34, 0x64, 0xe4, 0x33, 0x8e, 0x35, 0x6b, 0xd7, 0x5e,
-	0x58, 0xfc, 0x3d, 0xe5, 0x14, 0x95, 0x65, 0x8f, 0xa7, 0xa1, 0x5d, 0x5b, 0xa2, 0x7e, 0x5b, 0xfe,
-	0x20, 0x98, 0xf4, 0xae, 0xfb, 0x78, 0xfb, 0xb1, 0xf8, 0x04, 0xb3, 0x7b, 0xef, 0x7a, 0x1c, 0xa0,
-	0x77, 0x90, 0x70, 0x27, 0x18, 0x82, 0xd2, 0x41, 0x36, 0x59, 0xcd, 0xee, 0x1e, 0xb5, 0x6f, 0x3e,
-	0x5a, 0x56, 0xbf, 0x11, 0x44, 0x6e, 0xfc, 0xf0, 0x17, 0x80, 0xd3, 0x30, 0xe2, 0xab, 0x07, 0x7b,
-	0x4e, 0x1f, 0xe2, 0x7c, 0x7e, 0x0e, 0x85, 0xa3, 0x17, 0x4f, 0xde, 0x23, 0xfc, 0xf5, 0xfe, 0xf3,
-	0xcd, 0xcf, 0x9d, 0x7e, 0x2c, 0x75, 0x7d, 0x96, 0x9d, 0x6a, 0xdd, 0x24, 0xfe, 0x8f, 0xf0, 0xe1,
-	0x7f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xa2, 0xc7, 0x4a, 0x51, 0x35, 0x04, 0x00, 0x00,
+	// 473 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x94, 0x4d, 0x8a, 0xdb, 0x30,
+	0x14, 0xc7, 0xab, 0xc4, 0x76, 0x9c, 0x17, 0xf7, 0x4b, 0x29, 0x53, 0x4d, 0x66, 0x63, 0x4c, 0x29,
+	0x86, 0x42, 0x28, 0xe9, 0xa6, 0xeb, 0xce, 0x40, 0xc9, 0x40, 0xe9, 0xe0, 0x4d, 0x97, 0x46, 0x13,
+	0xc9, 0xb1, 0xc0, 0xb1, 0x5c, 0x59, 0xc5, 0xe4, 0x1e, 0xdd, 0xf5, 0x00, 0xdd, 0xf4, 0x5a, 0xbd,
+	0x47, 0x91, 0x94, 0x71, 0x3c, 0x25, 0x07, 0xc8, 0x52, 0xff, 0xdf, 0x5f, 0x4f, 0xef, 0xcb, 0x06,
+	0x60, 0xa2, 0x28, 0x96, 0x8d, 0x92, 0x5a, 0xe2, 0x60, 0x2b, 0x34, 0xad, 0xf6, 0x8b, 0xa8, 0x2d,
+	0xa9, 0xe2, 0xcc, 0xa9, 0xc9, 0x5f, 0x04, 0x2f, 0xaf, 0xe5, 0x6e, 0x27, 0xf4, 0x8d, 0x28, 0x8a,
+	0x8c, 0x7f, 0xff, 0xc1, 0x5b, 0x8d, 0x57, 0x00, 0x8a, 0x37, 0xb2, 0x15, 0x5a, 0xaa, 0x3d, 0x41,
+	0x31, 0x4a, 0x67, 0x2b, 0xbc, 0x74, 0x01, 0x96, 0x59, 0x4f, 0xb2, 0x81, 0x0b, 0xbf, 0x81, 0x67,
+	0x15, 0x2f, 0x74, 0xbe, 0xb1, 0xd1, 0x72, 0xc1, 0xc8, 0x28, 0x46, 0xe9, 0x34, 0x8b, 0x8c, 0xea,
+	0x9e, 0x58, 0x33, 0xfc, 0x16, 0x9e, 0x2b, 0xb1, 0x2d, 0x87, 0xb6, 0xb1, 0xb5, 0x3d, 0xb5, 0x72,
+	0xef, 0xfb, 0x08, 0x44, 0x6c, 0x6b, 0xa9, 0x78, 0xde, 0x95, 0x42, 0xf3, 0xb6, 0xa1, 0x1b, 0x9e,
+	0x6f, 0x4a, 0x5a, 0x6f, 0x39, 0xf1, 0x62, 0x94, 0x86, 0xd9, 0x85, 0xe3, 0xdf, 0x7a, 0x7c, 0x6d,
+	0x29, 0x7e, 0x05, 0x7e, 0x43, 0x75, 0xd9, 0x12, 0x3f, 0x1e, 0xa7, 0x51, 0xe6, 0x0e, 0xc9, 0xcf,
+	0x11, 0xe0, 0x61, 0x9d, 0x6d, 0x23, 0xeb, 0x96, 0xe3, 0x2b, 0x98, 0x16, 0x4a, 0xee, 0x72, 0x63,
+	0xb2, 0x75, 0x46, 0x59, 0x68, 0x84, 0x3b, 0xaa, 0x4b, 0xfc, 0x1a, 0x26, 0x5a, 0x3a, 0x34, 0xb2,
+	0x28, 0xd0, 0xf2, 0x01, 0xd8, 0x5b, 0x7d, 0xf2, 0x81, 0x39, 0xae, 0x19, 0x9e, 0x83, 0xaf, 0xa5,
+	0x91, 0x3d, 0x2b, 0x7b, 0x5a, 0xae, 0x19, 0xbe, 0x84, 0x50, 0x56, 0x2c, 0xdf, 0x49, 0xc6, 0x89,
+	0x1f, 0xa3, 0xd4, 0xcf, 0x26, 0xb2, 0x62, 0x5f, 0x24, 0xe3, 0x06, 0xd5, 0xbc, 0x73, 0x28, 0x70,
+	0xa8, 0xe6, 0x9d, 0x45, 0x17, 0x10, 0xdc, 0x8b, 0x9a, 0xaa, 0x3d, 0x99, 0xd8, 0x72, 0x0f, 0x27,
+	0xd3, 0x66, 0x45, 0x3b, 0x93, 0xd5, 0xa6, 0xcc, 0x19, 0xd5, 0x94, 0x4c, 0x6d, 0x6e, 0x91, 0xa2,
+	0xdd, 0x9d, 0x11, 0x6f, 0xa8, 0xa6, 0x38, 0x86, 0x88, 0xd7, 0x2c, 0x97, 0x85, 0x33, 0x12, 0xb0,
+	0x31, 0x80, 0xd7, 0xec, 0x6b, 0x61, 0x5d, 0xb7, 0x5e, 0x18, 0xbe, 0x98, 0x26, 0x7f, 0x50, 0xdf,
+	0x16, 0x5e, 0x69, 0x7a, 0x3e, 0xf3, 0xef, 0xa7, 0xe8, 0x0d, 0xa7, 0xf8, 0x1b, 0xc1, 0x6c, 0x90,
+	0xee, 0xf9, 0x8e, 0x2f, 0xf9, 0x04, 0xf3, 0x47, 0x7d, 0x3d, 0xec, 0xdb, 0x3b, 0x08, 0x98, 0x11,
+	0x5a, 0x82, 0xe2, 0x71, 0x3a, 0x5b, 0xcd, 0x1f, 0x9a, 0x3a, 0x34, 0x1f, 0x2c, 0xab, 0x5f, 0x08,
+	0x3c, 0xb3, 0xad, 0xf8, 0x33, 0xc0, 0x71, 0x77, 0xf1, 0xe5, 0x7f, 0x77, 0x8e, 0xdf, 0xed, 0x62,
+	0x71, 0x0a, 0xb9, 0xa7, 0x93, 0x27, 0xef, 0x11, 0xbe, 0x7d, 0xdc, 0xbe, 0xc5, 0xa9, 0xd7, 0x0f,
+	0xa1, 0xae, 0x4e, 0xb2, 0x63, 0xac, 0xfb, 0xc0, 0xfe, 0x40, 0x3e, 0xfc, 0x0b, 0x00, 0x00, 0xff,
+	0xff, 0x0c, 0x62, 0x85, 0xba, 0x64, 0x04, 0x00, 0x00,
 }
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 7ecc1b458..49891c3a0 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
@@ -1,6 +1,5 @@
-// Code generated by protoc-gen-go.
+// Code generated by protoc-gen-go. DO NOT EDIT.
 // source: notifications.proto
-// DO NOT EDIT!
 
 package gitaly
 
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 41165c0a2..fe3178e9f 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
@@ -1,6 +1,5 @@
-// Code generated by protoc-gen-go.
+// Code generated by protoc-gen-go. DO NOT EDIT.
 // source: ref.proto
-// DO NOT EDIT!
 
 package gitaly
 
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 48c656481..fea7b4302 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
@@ -1,6 +1,5 @@
-// Code generated by protoc-gen-go.
+// Code generated by protoc-gen-go. DO NOT EDIT.
 // source: shared.proto
-// DO NOT EDIT!
 
 package gitaly
 
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 07fec0653..3024bf626 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
@@ -1,6 +1,5 @@
-// Code generated by protoc-gen-go.
+// Code generated by protoc-gen-go. DO NOT EDIT.
 // source: smarthttp.proto
-// DO NOT EDIT!
 
 package gitaly
 
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 2fe41d027..81693891a 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
@@ -1,6 +1,5 @@
-// Code generated by protoc-gen-go.
+// Code generated by protoc-gen-go. DO NOT EDIT.
 // source: ssh.proto
-// DO NOT EDIT!
 
 package gitaly
 
diff --git a/vendor/vendor.json b/vendor/vendor.json
index 08a393ff7..9f219f973 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -131,20 +131,20 @@
 			"revisionTime": "2017-01-30T11:31:45Z"
 		},
 		{
-			"checksumSHA1": "xoChRi6dWPR0Bt78+zius0y/ur4=",
+			"checksumSHA1": "1P6wuKa+3R47Rxv7G6aV6ZTk0AM=",
 			"path": "gitlab.com/gitlab-org/gitaly-proto/go",
-			"revision": "8967f31f8d73482228a357acba0f1ce3744ceae2",
-			"revisionTime": "2017-05-05T12:14:06Z",
-			"version": "v0.7.0",
-			"versionExact": "v0.7.0"
+			"revision": "a3df13b83c05490abefdbd2827702ccaa41bff84",
+			"revisionTime": "2017-05-31T15:17:17Z",
+			"version": "v0.8.0",
+			"versionExact": "v0.8.0"
 		},
 		{
 			"checksumSHA1": "GkeSZfXVbtAkBZOrswot19GJZqQ=",
 			"path": "gitlab.com/gitlab-org/gitaly-proto/go/helper",
-			"revision": "8967f31f8d73482228a357acba0f1ce3744ceae2",
-			"revisionTime": "2017-05-05T12:14:06Z",
-			"version": "v0.7.0",
-			"versionExact": "v0.7.0"
+			"revision": "a3df13b83c05490abefdbd2827702ccaa41bff84",
+			"revisionTime": "2017-05-31T15:17:17Z",
+			"version": "v0.8.0",
+			"versionExact": "v0.8.0"
 		},
 		{
 			"checksumSHA1": "9jjO5GjLa0XF/nfWihF02RoH4qc=",