Merge branch '51083-fix-move-operation' into 'master'

Allow file moves to infer their content from the source path

See merge request gitlab-org/gitaly!980

7 files changed, 242 insertions, 126 deletions

diff --git a/changelogs/unreleased/51083-fix-move-operation.yml b/changelogs/unreleased/51083-fix-move-operation.yml
new file mode 100644
index 000000000..8efa6b008
--- /dev/null
+++ b/changelogs/unreleased/51083-fix-move-operation.yml
@@ -0,0 +1,5 @@
+---
+title: Allow moved files to infer their content based on the source
+merge_request: 980
+author:
+type: added
diff --git a/internal/service/operations/commit_files_test.go b/internal/service/operations/commit_files_test.go
index ab8d50153..b62192c0b 100644
--- a/internal/service/operations/commit_files_test.go
+++ b/internal/service/operations/commit_files_test.go
@@ -2,6 +2,7 @@ package operations_test
 
 import (
 	"fmt"
+	"strconv"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -129,6 +130,68 @@ func TestSuccessfulUserCommitFilesRequest(t *testing.T) {
 	}
 }
 
+func TestSuccessfulUserCommitFilesRequestMove(t *testing.T) {
+	server, serverSocketPath := runFullServer(t)
+	defer server.Stop()
+
+	client, conn := operations.NewOperationClient(t, serverSocketPath)
+	defer conn.Close()
+
+	ctxOuter, cancel := testhelper.Context()
+	defer cancel()
+
+	branchName := "master"
+	previousFilePath := "README"
+	filePath := "NEWREADME"
+	authorName := []byte("Jane Doe")
+	authorEmail := []byte("janedoe@gitlab.com")
+
+	for i, tc := range []struct {
+		content string
+		infer   bool
+	}{
+		{content: "", infer: false},
+		{content: "foo", infer: false},
+		{content: "", infer: true},
+		{content: "foo", infer: true},
+	} {
+		t.Run(strconv.Itoa(i), func(t *testing.T) {
+			testRepo, testRepoPath, cleanupFn := testhelper.NewTestRepo(t)
+			defer cleanupFn()
+
+			origFileContent := testhelper.MustRunCommand(t, nil, "git", "-C", testRepoPath, "show", branchName+":"+previousFilePath)
+			md := testhelper.GitalyServersMetadata(t, serverSocketPath)
+			ctx := metadata.NewOutgoingContext(ctxOuter, md)
+			headerRequest := headerRequest(testRepo, user, branchName, commitFilesMessage, authorName, authorEmail)
+			actionsRequest1 := moveFileHeaderRequest(previousFilePath, filePath, tc.infer)
+
+			stream, err := client.UserCommitFiles(ctx)
+			require.NoError(t, err)
+			require.NoError(t, stream.Send(headerRequest))
+			require.NoError(t, stream.Send(actionsRequest1))
+
+			if len(tc.content) > 0 {
+				actionsRequest2 := actionContentRequest(tc.content)
+				require.NoError(t, stream.Send(actionsRequest2))
+			}
+
+			r, err := stream.CloseAndRecv()
+			require.NoError(t, err)
+
+			update := r.GetBranchUpdate()
+			require.NotNil(t, update)
+
+			fileContent := testhelper.MustRunCommand(t, nil, "git", "-C", testRepoPath, "show", update.CommitId+":"+filePath)
+
+			if tc.infer {
+				require.Equal(t, string(origFileContent), string(fileContent))
+			} else {
+				require.Equal(t, tc.content, string(fileContent))
+			}
+		})
+	}
+}
+
 func TestFailedUserCommitFilesRequestDueToHooks(t *testing.T) {
 	server, serverSocketPath := runFullServer(t)
 	defer server.Stop()
@@ -337,6 +400,19 @@ func chmodFileHeaderRequest(filePath string, executeFilemode bool) *gitalypb.Use
 	})
 }
 
+func moveFileHeaderRequest(previousPath, filePath string, infer bool) *gitalypb.UserCommitFilesRequest {
+	return actionRequest(&gitalypb.UserCommitFilesAction{
+		UserCommitFilesActionPayload: &gitalypb.UserCommitFilesAction_Header{
+			Header: &gitalypb.UserCommitFilesActionHeader{
+				Action:       gitalypb.UserCommitFilesActionHeader_MOVE,
+				FilePath:     []byte(filePath),
+				PreviousPath: []byte(previousPath),
+				InferContent: infer,
+			},
+		},
+	})
+}
+
 func actionContentRequest(content string) *gitalypb.UserCommitFilesRequest {
 	return actionRequest(&gitalypb.UserCommitFilesAction{
 		UserCommitFilesActionPayload: &gitalypb.UserCommitFilesAction_Content{
diff --git a/ruby/lib/gitaly_server/operations_service.rb b/ruby/lib/gitaly_server/operations_service.rb
index a5d4fc278..7bfae31d3 100644
--- a/ruby/lib/gitaly_server/operations_service.rb
+++ b/ruby/lib/gitaly_server/operations_service.rb
@@ -375,6 +375,7 @@ module GitalyServer
         previous_path: set_utf8!(header.previous_path),
         encoding: header.base64_content ? 'base64' : '',
         content: '',
+        infer_content: header.infer_content,
         execute_filemode: header.execute_filemode
       }
     end
diff --git a/ruby/lib/gitlab/git/index.rb b/ruby/lib/gitlab/git/index.rb
index 701811045..b41f21381 100644
--- a/ruby/lib/gitlab/git/index.rb
+++ b/ruby/lib/gitlab/git/index.rb
@@ -7,7 +7,9 @@ module Gitlab
       EXECUTE_MODE = 0o100755
 
       ACTIONS = %w(create create_dir update move delete chmod).freeze
-      ACTION_OPTIONS = %i(file_path previous_path content encoding execute_filemode).freeze
+      ACTION_OPTIONS = %i(
+        file_path previous_path content encoding execute_filemode infer_content
+      ).freeze
 
       attr_reader :repository, :raw_index
 
@@ -65,14 +67,19 @@ module Gitlab
       def move(options)
         options = normalize_options(options)
 
-        file_entry = get(options[:previous_path])
-        raise IndexError, "A file with this name doesn't exist" unless file_entry
+        old_entry = get(options[:previous_path])
+        raise IndexError, "A file with this name doesn't exist" unless old_entry
 
-        raise IndexError, "A file with this name already exists" if get(options[:file_path])
+        new_entry = get(options[:file_path])
+        raise IndexError, "A file with this name already exists" if new_entry
 
         raw_index.remove(options[:previous_path])
 
-        add_blob(options, mode: file_entry[:mode])
+        if options[:infer_content]
+          raw_index.add(path: options[:file_path], oid: old_entry[:oid], mode: old_entry[:mode])
+        else
+          add_blob(options, mode: old_entry[:mode])
+        end
       end
 
       def delete(options)
diff --git a/ruby/spec/lib/gitlab/git/index_spec.rb b/ruby/spec/lib/gitlab/git/index_spec.rb
index fc54f77da..a426ee0c1 100644
--- a/ruby/spec/lib/gitlab/git/index_spec.rb
+++ b/ruby/spec/lib/gitlab/git/index_spec.rb
@@ -171,21 +171,23 @@ describe Gitlab::Git::Index do
     end
 
     context 'when a file at that path exists' do
+      let(:old_entry) { index.get(options[:previous_path]) }
+      let(:old_content) { lookup(old_entry[:oid]).content }
+
+      let(:new_entry) { index.get(options[:file_path]) }
+      let(:new_content) { lookup(new_entry[:oid]).content }
+
       it 'removes the old file in the index' do
         index.move(options)
 
-        entry = index.get(options[:previous_path])
-
-        expect(entry).to be_nil
+        expect(old_entry).to be_nil
       end
 
       it 'creates the new file in the index' do
         index.move(options)
 
-        entry = index.get(options[:file_path])
-
-        expect(entry).not_to be_nil
-        expect(lookup(entry[:oid]).content).to eq(options[:content])
+        expect(new_entry).not_to be_nil
+        expect(new_content).to eq(options[:content])
       end
 
       it 'preserves file mode' do
@@ -193,9 +195,22 @@ describe Gitlab::Git::Index do
 
         index.move(options)
 
-        entry = index.get(options[:file_path])
+        expect(new_entry[:mode]).to eq(0100755)
+      end
 
-        expect(entry[:mode]).to eq(0100755)
+      it 'preserves the original contents if infer_content is set' do
+        options[:content] = 'Not this'
+        options[:infer_content] = true
+
+        # Sanity check: this spec expects the the file at previous_path to be
+        # different to the content specified in the operation
+        expect(old_content).not_to eq(options[:content])
+
+        index.move(options)
+
+        expect(new_entry).not_to be_nil
+        expect(new_entry[:oid]).to eq(old_entry[:oid])
+        expect(old_content).to eq(new_content)
       end
     end
   end
diff --git a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/gitalypb/operations.pb.go b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/gitalypb/operations.pb.go
index d93204629..828f759de 100644
--- a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/gitalypb/operations.pb.go
+++ b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/gitalypb/operations.pb.go
@@ -766,6 +766,10 @@ type UserCommitFilesActionHeader struct {
 	PreviousPath    []byte                                 `protobuf:"bytes,3,opt,name=previous_path,json=previousPath,proto3" json:"previous_path,omitempty"`
 	Base64Content   bool                                   `protobuf:"varint,4,opt,name=base64_content,json=base64Content" json:"base64_content,omitempty"`
 	ExecuteFilemode bool                                   `protobuf:"varint,5,opt,name=execute_filemode,json=executeFilemode" json:"execute_filemode,omitempty"`
+	// Move actions that change the file path, but not its content, should set
+	// infer_content to true instead of populating the content field. Ignored for
+	// other action types.
+	InferContent bool `protobuf:"varint,6,opt,name=infer_content,json=inferContent" json:"infer_content,omitempty"`
 }
 
 func (m *UserCommitFilesActionHeader) Reset()                    { *m = UserCommitFilesActionHeader{} }
@@ -808,6 +812,13 @@ func (m *UserCommitFilesActionHeader) GetExecuteFilemode() bool {
 	return false
 }
 
+func (m *UserCommitFilesActionHeader) GetInferContent() bool {
+	if m != nil {
+		return m.InferContent
+	}
+	return false
+}
+
 type UserCommitFilesAction struct {
 	// Types that are valid to be assigned to UserCommitFilesActionPayload:
 	//	*UserCommitFilesAction_Header
@@ -2233,113 +2244,114 @@ var _OperationService_serviceDesc = grpc.ServiceDesc{
 func init() { proto.RegisterFile("operations.proto", fileDescriptor6) }
 
 var fileDescriptor6 = []byte{
-	// 1723 bytes of a gzipped FileDescriptorProto
+	// 1740 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x59, 0xcf, 0x6f, 0x1b, 0xd5,
 	0x13, 0xf7, 0xda, 0xce, 0xc6, 0x99, 0x38, 0x89, 0xf3, 0xfa, 0x2b, 0x75, 0x93, 0x26, 0xdd, 0xb4,
-	0xdf, 0x6f, 0x5b, 0xa1, 0x08, 0x05, 0x04, 0xa7, 0x82, 0xf2, 0xc3, 0x21, 0x2d, 0xa4, 0x0d, 0x9b,
-	0xa4, 0x70, 0x40, 0x5a, 0x36, 0xf6, 0xc3, 0x5e, 0x61, 0x7b, 0xdd, 0xb7, 0xeb, 0xd0, 0x20, 0xc4,
-	0x05, 0x01, 0x57, 0x4e, 0x5c, 0x10, 0x12, 0x88, 0x1b, 0xe2, 0xc2, 0x85, 0x03, 0x07, 0xc4, 0x15,
-	0x4e, 0x48, 0x3d, 0xf0, 0x5f, 0xf0, 0x37, 0xa0, 0xf7, 0x66, 0xd6, 0xfb, 0xd3, 0x51, 0x5a, 0x12,
-	0xb5, 0x42, 0xdc, 0xe2, 0x79, 0xb3, 0xf3, 0x66, 0x3e, 0xf3, 0xf3, 0x4d, 0xa0, 0xe2, 0xf6, 0xb8,
-	0xb0, 0x7d, 0xc7, 0xed, 0x7a, 0x4b, 0x3d, 0xe1, 0xfa, 0x2e, 0xd3, 0x9b, 0x8e, 0x6f, 0xb7, 0x0f,
-	0xab, 0x65, 0xaf, 0x65, 0x0b, 0xde, 0x40, 0xaa, 0xf1, 0xa3, 0x06, 0x17, 0xf6, 0x3c, 0x2e, 0xd6,
-	0x04, 0xb7, 0x7d, 0xbe, 0x2a, 0xec, 0x6e, 0xbd, 0x65, 0xf2, 0x07, 0x7d, 0xee, 0xf9, 0x6c, 0x19,
-	0x40, 0xf0, 0x9e, 0xeb, 0x39, 0xbe, 0x2b, 0x0e, 0x67, 0xb4, 0x05, 0xed, 0xfa, 0xf8, 0x32, 0x5b,
-	0x42, 0x31, 0x4b, 0xe6, 0xe0, 0xc4, 0x8c, 0x70, 0xb1, 0x79, 0x18, 0xdf, 0x57, 0x42, 0xac, 0xae,
-	0xdd, 0xe1, 0x33, 0xf9, 0x05, 0xed, 0x7a, 0xd9, 0x04, 0x24, 0xdd, 0xb5, 0x3b, 0x9c, 0x2d, 0x40,
-	0xb1, 0xef, 0x71, 0x31, 0x53, 0x50, 0xe2, 0xca, 0x81, 0x38, 0xa9, 0x83, 0xa9, 0x4e, 0xa4, 0x08,
-	0xcf, 0xb7, 0x85, 0x6f, 0xf5, 0x5c, 0xa7, 0xeb, 0xcf, 0x14, 0x51, 0x84, 0x22, 0x6d, 0x4b, 0x8a,
-	0xd1, 0x85, 0x99, 0xb4, 0xca, 0x5e, 0xcf, 0xed, 0x7a, 0x9c, 0xfd, 0x0f, 0x74, 0xbc, 0x8c, 0xf4,
-	0x9d, 0x0c, 0x2e, 0x20, 0x3e, 0x3a, 0x65, 0x37, 0x61, 0xba, 0x27, 0xb8, 0x25, 0x78, 0x9d, 0x3b,
-	0x07, 0xdc, 0xe2, 0x42, 0xb8, 0x42, 0x69, 0x3b, 0x66, 0x4e, 0xf5, 0x04, 0x37, 0x91, 0x5e, 0x93,
-	0x64, 0xe3, 0x57, 0xc2, 0x68, 0xaf, 0xd7, 0x78, 0x56, 0x30, 0x3a, 0x0f, 0x7a, 0x97, 0x7f, 0x20,
-	0xf8, 0x01, 0xc1, 0x43, 0xbf, 0x24, 0xdd, 0x6d, 0x37, 0x24, 0x7d, 0x04, 0xe9, 0xf8, 0xcb, 0xd8,
-	0x40, 0xc8, 0xe2, 0x16, 0x10, 0x64, 0x99, 0x50, 0x68, 0xd9, 0x50, 0x7c, 0x41, 0x50, 0xac, 0xf3,
-	0x36, 0x7f, 0x36, 0xa0, 0x08, 0x4c, 0x8b, 0x6b, 0xf4, 0x04, 0xa6, 0x7d, 0xae, 0xc1, 0xd9, 0x50,
-	0xd0, 0xae, 0xdd, 0xfc, 0x27, 0x76, 0x5d, 0x84, 0x92, 0x6f, 0x37, 0xa3, 0x46, 0x8d, 0xfa, 0x76,
-	0xf3, 0x98, 0x16, 0xad, 0xc1, 0xb9, 0x84, 0x22, 0x4f, 0x60, 0xce, 0xef, 0x64, 0x0e, 0x66, 0xc9,
-	0x53, 0x34, 0x87, 0xfd, 0x1f, 0xa6, 0x7c, 0x5b, 0x34, 0xb9, 0x6f, 0x09, 0x7e, 0xe0, 0x78, 0x8e,
-	0xdb, 0xa5, 0xa0, 0x9d, 0x44, 0xb2, 0x49, 0x54, 0x36, 0x03, 0xa3, 0x1d, 0xee, 0x79, 0x76, 0x93,
-	0x53, 0xf4, 0x06, 0x3f, 0x8d, 0x0f, 0x11, 0x91, 0x88, 0x2d, 0x84, 0xc8, 0x1c, 0x14, 0x7c, 0xbb,
-	0x49, 0x56, 0x8c, 0x07, 0x97, 0x4b, 0x0e, 0x49, 0x97, 0xe9, 0xc0, 0x1f, 0x3a, 0x9e, 0xef, 0x29,
-	0xad, 0x4b, 0x26, 0xfd, 0xca, 0x06, 0xb2, 0x90, 0x0d, 0xe4, 0x23, 0x0d, 0xce, 0xcb, 0xcb, 0xb7,
-	0xb8, 0x68, 0x9e, 0x40, 0xc4, 0x07, 0x78, 0xe5, 0x87, 0xe2, 0x75, 0x09, 0xc6, 0xea, 0x6e, 0xa7,
-	0xe3, 0xf8, 0x96, 0xd3, 0x20, 0xa5, 0x4a, 0x48, 0xb8, 0xdd, 0x90, 0x16, 0x51, 0x7d, 0xa3, 0xc4,
-	0xa7, 0x7a, 0x36, 0x14, 0x3b, 0x76, 0x16, 0x46, 0xec, 0x5e, 0xaf, 0x7d, 0x38, 0xa3, 0x2b, 0x08,
-	0xf0, 0x87, 0xf1, 0x03, 0x25, 0x72, 0xcc, 0x2a, 0x02, 0x35, 0xa6, 0x80, 0x96, 0x50, 0x60, 0x15,
-	0x26, 0x28, 0x63, 0xfb, 0xaa, 0x98, 0x90, 0xe3, 0xe7, 0x02, 0x43, 0xee, 0x05, 0x7d, 0x07, 0x85,
-	0x62, 0xc5, 0x31, 0xcb, 0xfb, 0x91, 0x5f, 0xd9, 0xf0, 0x17, 0x33, 0xe1, 0xbf, 0x53, 0x2c, 0xe5,
-	0x2b, 0x05, 0xe3, 0x63, 0x38, 0x97, 0x29, 0xf8, 0x68, 0x5d, 0xaf, 0x40, 0x59, 0x22, 0x6f, 0xd5,
-	0x55, 0xdc, 0x34, 0x28, 0x08, 0xc6, 0x25, 0x0d, 0x43, 0xa9, 0xc1, 0xae, 0xc1, 0x24, 0x99, 0x13,
-	0x30, 0x15, 0x14, 0x13, 0x19, 0x49, 0x6c, 0xc6, 0x37, 0x1a, 0x9c, 0x91, 0x70, 0x6d, 0x6c, 0x3c,
-	0xab, 0x11, 0x60, 0x7c, 0x46, 0x09, 0x1f, 0xaa, 0x48, 0xee, 0x4c, 0x79, 0x4c, 0x3b, 0x21, 0x8f,
-	0x0d, 0x69, 0x97, 0xbf, 0xe4, 0x29, 0x5b, 0x5b, 0x5c, 0x88, 0xc3, 0x6d, 0xa7, 0xfe, 0xfe, 0xe9,
-	0xa2, 0x75, 0x03, 0x74, 0x04, 0x87, 0x42, 0x71, 0x3a, 0xe0, 0x79, 0xcd, 0xf1, 0xd7, 0xd4, 0x81,
-	0x49, 0x0c, 0xc9, 0x76, 0x53, 0x4c, 0xb5, 0x9b, 0xe1, 0x69, 0x74, 0x13, 0xa6, 0x71, 0x2a, 0x89,
-	0x0a, 0xd0, 0x15, 0xcf, 0x94, 0x3a, 0x58, 0x0d, 0xa5, 0xdc, 0x82, 0x0a, 0xf2, 0x46, 0xac, 0x1d,
-	0x1d, 0x6a, 0x2d, 0x7e, 0x1e, 0x12, 0x8c, 0x3f, 0xa9, 0xe2, 0x44, 0x01, 0x3c, 0x59, 0x5f, 0x62,
-	0xac, 0x5b, 0xbe, 0xe0, 0x09, 0x5f, 0xe2, 0xc1, 0xae, 0xe0, 0xe8, 0x4b, 0x99, 0x41, 0x14, 0x89,
-	0xd1, 0x1a, 0x39, 0x8e, 0x34, 0x64, 0x79, 0x8c, 0x64, 0x36, 0x7e, 0xce, 0xc3, 0xb4, 0xf2, 0x1c,
-	0x3f, 0xe0, 0xd2, 0xe4, 0xff, 0xc2, 0xe2, 0x31, 0xc2, 0xe2, 0x91, 0x06, 0x2c, 0x0a, 0xde, 0xbf,
-	0x23, 0x24, 0xfe, 0xc8, 0xc3, 0x25, 0x15, 0xec, 0xea, 0xfb, 0x0d, 0xa7, 0xcd, 0xbd, 0x95, 0xba,
-	0x54, 0x77, 0x93, 0xdb, 0x0d, 0x2e, 0xd8, 0x06, 0xe8, 0xb6, 0xfa, 0xad, 0xec, 0x9a, 0x5c, 0x5e,
-	0x8a, 0xba, 0x7a, 0xc8, 0x47, 0x4b, 0xf8, 0x63, 0xf7, 0xb0, 0xc7, 0x4d, 0xfa, 0x5a, 0xd6, 0xd4,
-	0xf7, 0x9c, 0x36, 0xb7, 0x7a, 0xb6, 0xdf, 0xa2, 0x19, 0xa6, 0x24, 0x09, 0xdb, 0xb6, 0xdf, 0x62,
-	0x8b, 0x30, 0xd1, 0x93, 0xc3, 0x89, 0xdb, 0xf7, 0x90, 0xa1, 0xa0, 0x18, 0xca, 0x01, 0x51, 0x31,
-	0xc9, 0x56, 0x61, 0x7b, 0xfc, 0xa5, 0x17, 0xad, 0xba, 0xdb, 0xf5, 0x39, 0x3d, 0x4d, 0x64, 0xab,
-	0x50, 0xd4, 0x35, 0x24, 0xb2, 0x1b, 0x50, 0xe1, 0x0f, 0x79, 0xbd, 0xef, 0x73, 0x4b, 0xca, 0xef,
-	0xb8, 0x0d, 0x0c, 0x9a, 0x92, 0x39, 0x45, 0xf4, 0x0d, 0x22, 0x1b, 0x7b, 0x00, 0xa1, 0xa6, 0x0c,
-	0x40, 0x5f, 0x33, 0x6b, 0x2b, 0xbb, 0xb5, 0x4a, 0x8e, 0x4d, 0x02, 0xe0, 0xdf, 0xd6, 0xfa, 0x6d,
-	0xb3, 0xa2, 0xc9, 0xb3, 0xbd, 0xed, 0x75, 0x79, 0x96, 0x67, 0x25, 0x28, 0x6e, 0xdd, 0xbb, 0x5f,
-	0xab, 0x14, 0x24, 0x75, 0xbd, 0xf6, 0x46, 0x6d, 0xb7, 0x56, 0x29, 0xb2, 0x31, 0x18, 0x59, 0xdb,
-	0xdc, 0xba, 0xb7, 0x5e, 0x19, 0x31, 0xbe, 0xd4, 0xa8, 0x00, 0x27, 0xd1, 0x61, 0xb7, 0x40, 0x6f,
-	0x29, 0x84, 0x28, 0x48, 0x16, 0x8f, 0x01, 0xe6, 0x66, 0xce, 0xa4, 0x8f, 0x58, 0x15, 0x46, 0x03,
-	0xd3, 0x15, 0x82, 0x9b, 0x39, 0x33, 0x20, 0xac, 0x1a, 0xb0, 0x20, 0xd3, 0xce, 0xa2, 0xd8, 0x90,
-	0xa6, 0x7b, 0x16, 0x62, 0x6f, 0xf5, 0xec, 0xc3, 0xb6, 0x6b, 0x37, 0x8c, 0x4f, 0x0b, 0x30, 0x9b,
-	0xb8, 0x89, 0x6a, 0x00, 0x39, 0xfb, 0x74, 0x2a, 0x41, 0x22, 0xbd, 0x0b, 0xa9, 0xf4, 0xbe, 0x06,
-	0x93, 0xa4, 0x76, 0x90, 0xe5, 0x58, 0x02, 0x26, 0x90, 0xba, 0x45, 0xb9, 0xfe, 0x1c, 0x30, 0x62,
-	0xb3, 0xfb, 0x7e, 0xcb, 0x15, 0x28, 0x0e, 0x0b, 0x42, 0x05, 0x4f, 0x56, 0xd4, 0x81, 0x12, 0xba,
-	0x04, 0x67, 0xe2, 0xdc, 0xbc, 0x63, 0x3b, 0x6d, 0xaa, 0x0d, 0xd3, 0x51, 0xf6, 0x9a, 0x3c, 0xc8,
-	0xae, 0x24, 0xa3, 0xc7, 0xaf, 0x24, 0xa5, 0xe3, 0x57, 0x92, 0x9f, 0x82, 0x06, 0x93, 0xf2, 0x03,
-	0x7b, 0x25, 0x11, 0x21, 0x57, 0x87, 0x44, 0x48, 0xcc, 0x6f, 0x91, 0x10, 0x79, 0x79, 0x90, 0xae,
-	0xf9, 0x78, 0x19, 0xca, 0x8e, 0xb0, 0x5c, 0x90, 0x9f, 0xab, 0x8b, 0x70, 0x25, 0x1d, 0x3f, 0x02,
-	0x6f, 0x19, 0x04, 0xd0, 0xf7, 0xc1, 0xb6, 0x22, 0xaa, 0xc8, 0x09, 0xd6, 0xc1, 0x79, 0x18, 0x77,
-	0xba, 0x0d, 0xfe, 0x30, 0x56, 0x01, 0x41, 0x91, 0x8e, 0xa8, 0x6c, 0x43, 0x1e, 0x0e, 0xdf, 0x0d,
-	0x9a, 0x9d, 0x2c, 0x10, 0xa7, 0x3e, 0x31, 0x0a, 0x75, 0x4d, 0x64, 0x62, 0x44, 0xc2, 0x11, 0x6f,
-	0x86, 0x39, 0xa0, 0x24, 0xb0, 0xbc, 0x96, 0xad, 0xe2, 0x78, 0xcc, 0x1c, 0x43, 0xca, 0x4e, 0xcb,
-	0x66, 0xaf, 0xc2, 0xb4, 0xe0, 0x1d, 0xd7, 0xe7, 0xd1, 0x28, 0xd3, 0x87, 0x2a, 0x5c, 0x41, 0xe6,
-	0x90, 0x22, 0xab, 0x2a, 0x09, 0xa0, 0xeb, 0x31, 0x9a, 0xcb, 0x48, 0x44, 0x37, 0x18, 0x1f, 0x05,
-	0x4d, 0x0d, 0x41, 0x1a, 0xbc, 0xeb, 0x80, 0xec, 0x91, 0xaa, 0xe1, 0x5c, 0x4f, 0x16, 0x4a, 0xd5,
-	0x1e, 0x63, 0x1c, 0x95, 0xd0, 0x34, 0x13, 0xcd, 0xaa, 0xd4, 0xa4, 0x4e, 0x65, 0x7c, 0x4b, 0x3e,
-	0xda, 0x79, 0xd0, 0xb7, 0xbd, 0xd3, 0x9f, 0xea, 0x3d, 0x75, 0x4d, 0xc4, 0x47, 0x48, 0x38, 0xc2,
-	0x47, 0xf2, 0x23, 0x95, 0xe9, 0xa1, 0x8b, 0x4a, 0x8a, 0x20, 0x61, 0xb8, 0x00, 0xa3, 0xbc, 0xdb,
-	0x50, 0x47, 0xba, 0x3a, 0xd2, 0x79, 0xb7, 0x21, 0x0f, 0xae, 0x82, 0x8e, 0x45, 0x87, 0xe6, 0x8b,
-	0xb8, 0x3a, 0x74, 0x96, 0x51, 0xf6, 0x4a, 0x19, 0x65, 0xcf, 0x70, 0xd0, 0x43, 0x01, 0x44, 0xa1,
-	0x87, 0xc8, 0x9a, 0x88, 0x87, 0x90, 0x22, 0x35, 0x38, 0x0a, 0x75, 0x7c, 0xd3, 0x99, 0x69, 0x17,
-	0x1a, 0x5f, 0xd3, 0xd3, 0x61, 0x45, 0xbe, 0x51, 0xb7, 0x6d, 0x3f, 0x7c, 0x68, 0x1d, 0x59, 0x97,
-	0x52, 0xec, 0x4b, 0x59, 0xad, 0xab, 0x27, 0x19, 0xb8, 0x17, 0xb6, 0x2e, 0x22, 0x54, 0x3f, 0xd1,
-	0x40, 0x3f, 0xd5, 0x06, 0xb4, 0x08, 0x13, 0xb4, 0x01, 0x21, 0x1f, 0xd3, 0x78, 0x81, 0x44, 0x4c,
-	0x84, 0x41, 0x03, 0x55, 0xef, 0x73, 0x4b, 0xe9, 0x96, 0xaa, 0x7f, 0xef, 0x60, 0xdd, 0x8e, 0xda,
-	0x7b, 0x72, 0xd5, 0xcf, 0xf8, 0x4b, 0x83, 0x6a, 0xb8, 0x25, 0xdc, 0xe9, 0xef, 0x77, 0xdc, 0x46,
-	0xbf, 0x7d, 0xca, 0x95, 0x6b, 0x0e, 0x80, 0x82, 0x50, 0xc6, 0x11, 0x46, 0x0a, 0xbd, 0x7e, 0x65,
-	0x1c, 0x0d, 0xcb, 0x8b, 0x59, 0x18, 0xf3, 0x02, 0x05, 0xa9, 0x05, 0x87, 0x84, 0x8c, 0xc8, 0xd6,
-	0xb3, 0x22, 0xfb, 0x37, 0x0d, 0x67, 0xcf, 0x94, 0xc1, 0x4f, 0xe7, 0xe5, 0x9c, 0x1a, 0xad, 0x8b,
-	0xa9, 0xd1, 0xfa, 0x4e, 0xb1, 0x54, 0xa8, 0x14, 0xcd, 0xf4, 0xb4, 0xbe, 0xfc, 0xd5, 0x18, 0x54,
-	0x06, 0xfa, 0xec, 0x70, 0x71, 0xe0, 0xd4, 0x39, 0x7b, 0x0b, 0x2a, 0xc9, 0x4d, 0x39, 0x9b, 0x8f,
-	0x75, 0xe4, 0xf4, 0xda, 0xbf, 0xba, 0x30, 0x9c, 0x01, 0x71, 0x31, 0x72, 0x81, 0xe0, 0xe8, 0x3e,
-	0x39, 0x2e, 0x38, 0x63, 0x57, 0x1e, 0x17, 0x9c, 0xb5, 0x8a, 0x0e, 0x05, 0x47, 0xb7, 0xb9, 0x71,
-	0xc1, 0x19, 0x9b, 0xe7, 0xb8, 0xe0, 0xac, 0x45, 0xb0, 0x91, 0x63, 0x77, 0x61, 0x22, 0xb6, 0x42,
-	0x64, 0xb3, 0x69, 0x33, 0xc3, 0x2d, 0x69, 0x75, 0x6e, 0xc8, 0x69, 0x52, 0xde, 0x60, 0x49, 0x1b,
-	0x97, 0x97, 0x5c, 0x22, 0xc7, 0xe5, 0xa5, 0x36, 0xbb, 0x46, 0x8e, 0xbd, 0x0d, 0x53, 0x89, 0x7d,
-	0x1c, 0xbb, 0x1c, 0xfd, 0x26, 0xbd, 0x7e, 0xac, 0xce, 0x0f, 0x3d, 0x0f, 0xa4, 0x5e, 0xd7, 0x9e,
-	0xd7, 0xd8, 0xeb, 0x50, 0x8e, 0xee, 0x85, 0xd8, 0xa5, 0xe8, 0x67, 0x89, 0x85, 0x56, 0x75, 0x36,
-	0xfb, 0x70, 0xa0, 0xe6, 0x9b, 0x30, 0x19, 0x5f, 0x4d, 0xb0, 0x38, 0x52, 0xc9, 0x9d, 0x4f, 0xf5,
-	0xf2, 0xb0, 0xe3, 0x81, 0xc8, 0x1a, 0x40, 0xf8, 0xac, 0x65, 0x17, 0x63, 0x35, 0x22, 0xba, 0x27,
-	0xa8, 0x56, 0xb3, 0x8e, 0x06, 0x62, 0xee, 0x23, 0x80, 0x91, 0xd1, 0x30, 0x0e, 0x60, 0x7a, 0x78,
-	0x8d, 0x03, 0x98, 0x31, 0x53, 0x4a, 0x00, 0x43, 0xf5, 0xe4, 0xf0, 0x91, 0x54, 0x2f, 0x32, 0xd9,
-	0x25, 0xd5, 0x8b, 0xce, 0x33, 0xa1, 0x95, 0xd8, 0x45, 0xe3, 0x62, 0x62, 0xc3, 0x47, 0x5c, 0x4c,
-	0xbc, 0xe9, 0x1a, 0x39, 0xb6, 0x83, 0xf8, 0x87, 0x1d, 0x20, 0x8e, 0x7f, 0xaa, 0x13, 0xc6, 0xf1,
-	0x4f, 0x37, 0x0e, 0x65, 0xe2, 0xbb, 0xb8, 0xdc, 0x4c, 0x94, 0x41, 0x66, 0xa4, 0xf3, 0x35, 0xd9,
-	0x14, 0xaa, 0x8b, 0x47, 0xf2, 0x04, 0x77, 0xec, 0xeb, 0xea, 0xbf, 0x8d, 0x2f, 0xfc, 0x1d, 0x00,
-	0x00, 0xff, 0xff, 0x84, 0xcd, 0xe8, 0xb5, 0x97, 0x1c, 0x00, 0x00,
+	0xdf, 0x6f, 0x5b, 0x7d, 0x15, 0x7d, 0x15, 0x10, 0x9c, 0x0a, 0xca, 0x0f, 0x87, 0xb4, 0x90, 0x36,
+	0x6c, 0x92, 0xc2, 0x01, 0x69, 0xd9, 0xd8, 0xaf, 0xf6, 0x0a, 0xdb, 0xeb, 0xbe, 0x5d, 0x87, 0x06,
+	0x21, 0x2e, 0x08, 0xb8, 0x72, 0xe2, 0x82, 0x90, 0x40, 0xdc, 0x10, 0x17, 0x2e, 0x1c, 0x38, 0x20,
+	0xae, 0x70, 0xed, 0x81, 0xff, 0x82, 0x1b, 0x77, 0xf4, 0xde, 0xcc, 0x7a, 0x7f, 0x3a, 0x4a, 0x4b,
+	0xa2, 0x56, 0x88, 0x5b, 0x3c, 0x33, 0x3b, 0x6f, 0xe6, 0x33, 0xf3, 0x66, 0xe6, 0x4d, 0xa0, 0xe2,
+	0xf6, 0xb8, 0xb0, 0x7d, 0xc7, 0xed, 0x7a, 0x4b, 0x3d, 0xe1, 0xfa, 0x2e, 0xd3, 0x9b, 0x8e, 0x6f,
+	0xb7, 0x0f, 0xab, 0x65, 0xaf, 0x65, 0x0b, 0xde, 0x40, 0xaa, 0xf1, 0x83, 0x06, 0x17, 0xf6, 0x3c,
+	0x2e, 0xd6, 0x04, 0xb7, 0x7d, 0xbe, 0x2a, 0xec, 0x6e, 0xbd, 0x65, 0xf2, 0x87, 0x7d, 0xee, 0xf9,
+	0x6c, 0x19, 0x40, 0xf0, 0x9e, 0xeb, 0x39, 0xbe, 0x2b, 0x0e, 0x67, 0xb4, 0x05, 0xed, 0xfa, 0xf8,
+	0x32, 0x5b, 0x42, 0x35, 0x4b, 0xe6, 0x80, 0x63, 0x46, 0xa4, 0xd8, 0x3c, 0x8c, 0xef, 0x2b, 0x25,
+	0x56, 0xd7, 0xee, 0xf0, 0x99, 0xfc, 0x82, 0x76, 0xbd, 0x6c, 0x02, 0x92, 0xee, 0xda, 0x1d, 0xce,
+	0x16, 0xa0, 0xd8, 0xf7, 0xb8, 0x98, 0x29, 0x28, 0x75, 0xe5, 0x40, 0x9d, 0xb4, 0xc1, 0x54, 0x1c,
+	0xa9, 0xc2, 0xf3, 0x6d, 0xe1, 0x5b, 0x3d, 0xd7, 0xe9, 0xfa, 0x33, 0x45, 0x54, 0xa1, 0x48, 0xdb,
+	0x92, 0x62, 0x74, 0x61, 0x26, 0x6d, 0xb2, 0xd7, 0x73, 0xbb, 0x1e, 0x67, 0xff, 0x01, 0x1d, 0x0f,
+	0x23, 0x7b, 0x27, 0x83, 0x03, 0x48, 0x8e, 0xb8, 0xec, 0x26, 0x4c, 0xf7, 0x04, 0xb7, 0x04, 0xaf,
+	0x73, 0xe7, 0x80, 0x5b, 0x5c, 0x08, 0x57, 0x28, 0x6b, 0xc7, 0xcc, 0xa9, 0x9e, 0xe0, 0x26, 0xd2,
+	0x6b, 0x92, 0x6c, 0xfc, 0x42, 0x18, 0xed, 0xf5, 0x1a, 0xcf, 0x0b, 0x46, 0xe7, 0x41, 0xef, 0xf2,
+	0xf7, 0x05, 0x3f, 0x20, 0x78, 0xe8, 0x97, 0xa4, 0xbb, 0xed, 0x86, 0xa4, 0x8f, 0x20, 0x1d, 0x7f,
+	0x19, 0x1b, 0x08, 0x59, 0xdc, 0x03, 0x82, 0x2c, 0x13, 0x0a, 0x2d, 0x1b, 0x8a, 0xcf, 0x09, 0x8a,
+	0x75, 0xde, 0xe6, 0xcf, 0x07, 0x14, 0x81, 0x6b, 0x71, 0x8b, 0x9e, 0xc2, 0xb5, 0xcf, 0x34, 0x38,
+	0x1b, 0x2a, 0xda, 0xb5, 0x9b, 0x7f, 0xc7, 0xaf, 0x8b, 0x50, 0xf2, 0xed, 0x66, 0xd4, 0xa9, 0x51,
+	0xdf, 0x6e, 0x1e, 0xd3, 0xa3, 0x35, 0x38, 0x97, 0x30, 0xe4, 0x29, 0xdc, 0xf9, 0x8d, 0xdc, 0xc1,
+	0x5b, 0xf2, 0x0c, 0xdd, 0x61, 0xff, 0x85, 0x29, 0xdf, 0x16, 0x4d, 0xee, 0x5b, 0x82, 0x1f, 0x38,
+	0x9e, 0xe3, 0x76, 0x29, 0x69, 0x27, 0x91, 0x6c, 0x12, 0x95, 0xcd, 0xc0, 0x68, 0x87, 0x7b, 0x9e,
+	0xdd, 0xe4, 0x94, 0xbd, 0xc1, 0x4f, 0xe3, 0x03, 0x44, 0x24, 0xe2, 0x0b, 0x21, 0x32, 0x07, 0x05,
+	0xdf, 0x6e, 0x92, 0x17, 0xe3, 0xc1, 0xe1, 0x52, 0x42, 0xd2, 0xe5, 0x75, 0xe0, 0x8f, 0x1c, 0xcf,
+	0xf7, 0x94, 0xd5, 0x25, 0x93, 0x7e, 0x65, 0x03, 0x59, 0xc8, 0x06, 0xf2, 0xb1, 0x06, 0xe7, 0xe5,
+	0xe1, 0x5b, 0x5c, 0x34, 0x4f, 0x20, 0xe3, 0x03, 0xbc, 0xf2, 0x43, 0xf1, 0xba, 0x04, 0x63, 0x75,
+	0xb7, 0xd3, 0x71, 0x7c, 0xcb, 0x69, 0x90, 0x51, 0x25, 0x24, 0xdc, 0x6e, 0x48, 0x8f, 0xa8, 0xbe,
+	0xd1, 0xc5, 0xa7, 0x7a, 0x36, 0x14, 0x3b, 0x76, 0x16, 0x46, 0xec, 0x5e, 0xaf, 0x7d, 0x38, 0xa3,
+	0x2b, 0x08, 0xf0, 0x87, 0xf1, 0x3d, 0x5d, 0xe4, 0x98, 0x57, 0x04, 0x6a, 0xcc, 0x00, 0x2d, 0x61,
+	0xc0, 0x2a, 0x4c, 0xd0, 0x8d, 0xed, 0xab, 0x62, 0x42, 0x81, 0x9f, 0x0b, 0x1c, 0xb9, 0x17, 0xf4,
+	0x1d, 0x54, 0x8a, 0x15, 0xc7, 0x2c, 0xef, 0x47, 0x7e, 0x65, 0xc3, 0x5f, 0xcc, 0x84, 0xff, 0x4e,
+	0xb1, 0x94, 0xaf, 0x14, 0x8c, 0x8f, 0xe0, 0x5c, 0xa6, 0xe2, 0xa3, 0x6d, 0xbd, 0x02, 0x65, 0x89,
+	0xbc, 0x55, 0x57, 0x79, 0xd3, 0xa0, 0x24, 0x18, 0x97, 0x34, 0x4c, 0xa5, 0x06, 0xbb, 0x06, 0x93,
+	0xe4, 0x4e, 0x20, 0x54, 0x50, 0x42, 0xe4, 0x24, 0x89, 0x19, 0x5f, 0x6b, 0x70, 0x46, 0xc2, 0xb5,
+	0xb1, 0xf1, 0xbc, 0x66, 0x80, 0xf1, 0x29, 0x5d, 0xf8, 0xd0, 0x44, 0x0a, 0x67, 0x2a, 0x62, 0xda,
+	0x09, 0x45, 0x6c, 0x48, 0xbb, 0xfc, 0x39, 0x4f, 0xb7, 0xb5, 0xc5, 0x85, 0x38, 0xdc, 0x76, 0xea,
+	0xef, 0x9d, 0x2e, 0x5a, 0x37, 0x40, 0x47, 0x70, 0x28, 0x15, 0xa7, 0x03, 0x99, 0xd7, 0x1c, 0x7f,
+	0x4d, 0x31, 0x4c, 0x12, 0x48, 0xb6, 0x9b, 0x62, 0xaa, 0xdd, 0x0c, 0xbf, 0x46, 0x37, 0x61, 0x1a,
+	0xa7, 0x92, 0xa8, 0x02, 0x5d, 0xc9, 0x4c, 0x29, 0xc6, 0x6a, 0xa8, 0xe5, 0x16, 0x54, 0x50, 0x36,
+	0xe2, 0xed, 0xe8, 0x50, 0x6f, 0xf1, 0xf3, 0x90, 0x60, 0xfc, 0x4e, 0x15, 0x27, 0x0a, 0xe0, 0xc9,
+	0xc6, 0x12, 0x73, 0xdd, 0xf2, 0x05, 0x4f, 0xc4, 0x12, 0x19, 0xbb, 0x82, 0x63, 0x2c, 0xe5, 0x0d,
+	0xa2, 0x4c, 0x8c, 0xd6, 0xc8, 0x71, 0xa4, 0xa1, 0xc8, 0x13, 0x5c, 0x66, 0xe3, 0xa7, 0x3c, 0x4c,
+	0xab, 0xc8, 0xf1, 0x03, 0x2e, 0x5d, 0xfe, 0x37, 0x2d, 0x9e, 0x20, 0x2d, 0x1e, 0x6b, 0xc0, 0xa2,
+	0xe0, 0xfd, 0x33, 0x52, 0xe2, 0xcf, 0x3c, 0x5c, 0x52, 0xc9, 0xae, 0xbe, 0xdf, 0x70, 0xda, 0xdc,
+	0x5b, 0xa9, 0x4b, 0x73, 0x37, 0xb9, 0xdd, 0xe0, 0x82, 0x6d, 0x80, 0x6e, 0xab, 0xdf, 0xca, 0xaf,
+	0xc9, 0xe5, 0xa5, 0x68, 0xa8, 0x87, 0x7c, 0xb4, 0x84, 0x3f, 0x76, 0x0f, 0x7b, 0xdc, 0xa4, 0xaf,
+	0x65, 0x4d, 0x7d, 0xe0, 0xb4, 0xb9, 0xd5, 0xb3, 0xfd, 0x16, 0xcd, 0x30, 0x25, 0x49, 0xd8, 0xb6,
+	0xfd, 0x16, 0x5b, 0x84, 0x89, 0x9e, 0x1c, 0x4e, 0xdc, 0xbe, 0x87, 0x02, 0x05, 0x25, 0x50, 0x0e,
+	0x88, 0x4a, 0x48, 0xb6, 0x0a, 0xdb, 0xe3, 0x2f, 0xbd, 0x68, 0xd5, 0xdd, 0xae, 0xcf, 0xe9, 0x69,
+	0x22, 0x5b, 0x85, 0xa2, 0xae, 0x21, 0x91, 0xdd, 0x80, 0x0a, 0x7f, 0xc4, 0xeb, 0x7d, 0x9f, 0x5b,
+	0x52, 0x7f, 0xc7, 0x6d, 0x60, 0xd2, 0x94, 0xcc, 0x29, 0xa2, 0x6f, 0x10, 0x59, 0x1e, 0xeb, 0x74,
+	0x1f, 0x70, 0x31, 0x50, 0x88, 0x2d, 0xba, 0xac, 0x88, 0xa4, 0xcf, 0xd8, 0x03, 0x08, 0xdd, 0x61,
+	0x00, 0xfa, 0x9a, 0x59, 0x5b, 0xd9, 0xad, 0x55, 0x72, 0x6c, 0x12, 0x00, 0xff, 0xb6, 0xd6, 0x6f,
+	0x9b, 0x15, 0x4d, 0xf2, 0xf6, 0xb6, 0xd7, 0x25, 0x2f, 0xcf, 0x4a, 0x50, 0xdc, 0xba, 0x77, 0xbf,
+	0x56, 0x29, 0x48, 0xea, 0x7a, 0xed, 0x8d, 0xda, 0x6e, 0xad, 0x52, 0x64, 0x63, 0x30, 0xb2, 0xb6,
+	0xb9, 0x75, 0x6f, 0xbd, 0x32, 0x62, 0x7c, 0xa1, 0x51, 0x95, 0x4e, 0x42, 0xc8, 0x6e, 0x81, 0xde,
+	0x52, 0x30, 0x52, 0x26, 0x2d, 0x1e, 0x03, 0xf1, 0xcd, 0x9c, 0x49, 0x1f, 0xb1, 0x2a, 0x8c, 0x06,
+	0xee, 0x28, 0x98, 0x37, 0x73, 0x66, 0x40, 0x58, 0x35, 0x60, 0x41, 0xde, 0x4d, 0x8b, 0x12, 0x48,
+	0xe2, 0xe3, 0x59, 0x18, 0x20, 0xab, 0x67, 0x1f, 0xb6, 0x5d, 0xbb, 0x61, 0x7c, 0x52, 0x80, 0xd9,
+	0xc4, 0x49, 0x54, 0x28, 0x28, 0x23, 0x4e, 0xa7, 0x5c, 0x24, 0x6a, 0x40, 0x21, 0x55, 0x03, 0xae,
+	0xc1, 0x24, 0x99, 0x1d, 0x94, 0x02, 0xac, 0x13, 0x13, 0x48, 0xdd, 0xa2, 0x82, 0xf0, 0x3f, 0x60,
+	0x24, 0x66, 0xf7, 0xfd, 0x96, 0x2b, 0x50, 0x1d, 0x56, 0x8d, 0x0a, 0x72, 0x56, 0x14, 0x43, 0x29,
+	0x5d, 0x82, 0x33, 0x71, 0x69, 0xde, 0xb1, 0x9d, 0x36, 0x15, 0x90, 0xe9, 0xa8, 0x78, 0x4d, 0x32,
+	0xb2, 0xcb, 0xcd, 0xe8, 0xf1, 0xcb, 0x4d, 0xe9, 0xf8, 0xe5, 0xe6, 0xc7, 0xa0, 0x0b, 0xa5, 0xe2,
+	0xc0, 0x5e, 0x49, 0x64, 0xc8, 0xd5, 0x21, 0x19, 0x12, 0x8b, 0x5b, 0x24, 0x45, 0x5e, 0x1e, 0xdc,
+	0xe9, 0x7c, 0xbc, 0x56, 0x65, 0x67, 0x58, 0x2e, 0xb8, 0xc4, 0xab, 0x8b, 0x70, 0x25, 0x9d, 0x3f,
+	0x02, 0x4f, 0x19, 0x24, 0xd0, 0x77, 0xc1, 0x4a, 0x23, 0x6a, 0xc8, 0x09, 0x16, 0xcb, 0x79, 0x18,
+	0x77, 0xba, 0x0d, 0xfe, 0x28, 0x56, 0x26, 0x41, 0x91, 0x8e, 0x28, 0x7f, 0x43, 0x5e, 0x17, 0xdf,
+	0x0e, 0x3a, 0xa2, 0xac, 0x22, 0xa7, 0x3e, 0x56, 0x0a, 0x75, 0x4c, 0x64, 0xac, 0x44, 0xc2, 0x11,
+	0x0f, 0x8b, 0x39, 0xa0, 0x4b, 0x60, 0x79, 0x2d, 0x5b, 0xe5, 0xf1, 0x98, 0x39, 0x86, 0x94, 0x9d,
+	0x96, 0xcd, 0x5e, 0x85, 0x69, 0xc1, 0x3b, 0xae, 0xcf, 0xa3, 0x59, 0xa6, 0x0f, 0x35, 0xb8, 0x82,
+	0xc2, 0x21, 0x45, 0xd6, 0x40, 0x52, 0x40, 0xc7, 0x63, 0x36, 0x97, 0x91, 0x88, 0x61, 0x30, 0x3e,
+	0x0c, 0x3a, 0x1f, 0x82, 0x34, 0x78, 0xfc, 0x01, 0xf9, 0x23, 0x4d, 0xc3, 0xe1, 0x9f, 0x3c, 0x94,
+	0xa6, 0x3d, 0xc1, 0xcc, 0x2a, 0xa1, 0x69, 0x26, 0x3a, 0x5a, 0xa9, 0x49, 0xed, 0xcc, 0xf8, 0x86,
+	0x62, 0xb4, 0xf3, 0xb0, 0x6f, 0x7b, 0xa7, 0x3f, 0xfa, 0x7b, 0xea, 0x98, 0x48, 0x8c, 0x90, 0x70,
+	0x44, 0x8c, 0xe4, 0x47, 0xea, 0xa6, 0x87, 0x21, 0x2a, 0x29, 0x82, 0x84, 0xe1, 0x02, 0x8c, 0xf2,
+	0x6e, 0x43, 0xb1, 0x74, 0xc5, 0xd2, 0x79, 0xb7, 0x21, 0x19, 0x57, 0x41, 0xc7, 0xa2, 0x43, 0x43,
+	0x48, 0xdc, 0x1c, 0xe2, 0x65, 0x94, 0xbd, 0x52, 0x46, 0xd9, 0x33, 0x1c, 0x8c, 0x50, 0x00, 0x51,
+	0x18, 0x21, 0xf2, 0x26, 0x12, 0x21, 0xa4, 0x48, 0x0b, 0x8e, 0x42, 0x1d, 0x1f, 0x7e, 0x66, 0x3a,
+	0x84, 0xc6, 0x57, 0xf4, 0xbe, 0x58, 0x91, 0x0f, 0xd9, 0x6d, 0xdb, 0x0f, 0x5f, 0x63, 0x47, 0xd6,
+	0xa5, 0x94, 0xf8, 0x52, 0x56, 0xeb, 0xea, 0x49, 0x01, 0xee, 0x85, 0xad, 0x8b, 0x08, 0xd5, 0x8f,
+	0x35, 0xd0, 0x4f, 0xb5, 0x01, 0x2d, 0xc2, 0x04, 0xad, 0x49, 0x28, 0xc6, 0x34, 0x83, 0x20, 0x11,
+	0x2f, 0xc2, 0xa0, 0x81, 0xaa, 0x47, 0xbc, 0xa5, 0x6c, 0x4b, 0xd5, 0xbf, 0x77, 0xb0, 0x6e, 0x47,
+	0xfd, 0x3d, 0xb9, 0xea, 0x67, 0xfc, 0xa1, 0x41, 0x35, 0x5c, 0x25, 0xee, 0xf4, 0xf7, 0x3b, 0x6e,
+	0xa3, 0xdf, 0x3e, 0xe5, 0xca, 0x35, 0x07, 0x40, 0x49, 0x28, 0xf3, 0x08, 0x33, 0x85, 0x9e, 0xc8,
+	0x32, 0x8f, 0x86, 0xdd, 0x8b, 0x59, 0x18, 0xf3, 0x02, 0x03, 0xa9, 0x05, 0x87, 0x84, 0x8c, 0xcc,
+	0xd6, 0xb3, 0x32, 0xfb, 0x57, 0x0d, 0x07, 0xd4, 0x94, 0xc3, 0xcf, 0xe6, 0x79, 0x9d, 0x9a, 0xbf,
+	0x8b, 0xa9, 0xf9, 0xfb, 0x4e, 0xb1, 0x54, 0xa8, 0x14, 0xcd, 0xf4, 0x48, 0xbf, 0xfc, 0xe5, 0x18,
+	0x54, 0x06, 0xf6, 0xec, 0x70, 0x71, 0xe0, 0xd4, 0x39, 0x7b, 0x0b, 0x2a, 0xc9, 0x75, 0x3a, 0x9b,
+	0x8f, 0x75, 0xe4, 0xf4, 0xff, 0x06, 0xaa, 0x0b, 0xc3, 0x05, 0x10, 0x17, 0x23, 0x17, 0x28, 0x8e,
+	0x2e, 0x9d, 0xe3, 0x8a, 0x33, 0x16, 0xea, 0x71, 0xc5, 0x59, 0xfb, 0xea, 0x50, 0x71, 0x74, 0xe5,
+	0x1b, 0x57, 0x9c, 0xb1, 0x9e, 0x8e, 0x2b, 0xce, 0xda, 0x16, 0x1b, 0x39, 0x76, 0x17, 0x26, 0x62,
+	0x7b, 0x46, 0x36, 0x9b, 0x76, 0x33, 0x5c, 0xa5, 0x56, 0xe7, 0x86, 0x70, 0x93, 0xfa, 0x06, 0x9b,
+	0xdc, 0xb8, 0xbe, 0xe4, 0xa6, 0x39, 0xae, 0x2f, 0xb5, 0xfe, 0x35, 0x72, 0xec, 0x6d, 0x98, 0x4a,
+	0x2c, 0xed, 0xd8, 0xe5, 0xe8, 0x37, 0xe9, 0x1d, 0x65, 0x75, 0x7e, 0x28, 0x3f, 0xd0, 0x7a, 0x5d,
+	0xfb, 0xbf, 0xc6, 0x5e, 0x87, 0x72, 0x74, 0x79, 0xc4, 0x2e, 0x45, 0x3f, 0x4b, 0x6c, 0xbd, 0xaa,
+	0xb3, 0xd9, 0xcc, 0x81, 0x99, 0x6f, 0xc2, 0x64, 0x7c, 0x7f, 0xc1, 0xe2, 0x48, 0x25, 0x17, 0x43,
+	0xd5, 0xcb, 0xc3, 0xd8, 0x03, 0x95, 0x35, 0x80, 0xf0, 0xed, 0xcb, 0x2e, 0xc6, 0x6a, 0x44, 0x74,
+	0x99, 0x50, 0xad, 0x66, 0xb1, 0x06, 0x6a, 0xee, 0x23, 0x80, 0x91, 0xd1, 0x30, 0x0e, 0x60, 0x7a,
+	0x78, 0x8d, 0x03, 0x98, 0x31, 0x53, 0x4a, 0x00, 0x43, 0xf3, 0xe4, 0xf0, 0x91, 0x34, 0x2f, 0x32,
+	0xd9, 0x25, 0xcd, 0x8b, 0xce, 0x33, 0xa1, 0x97, 0xd8, 0x45, 0xe3, 0x6a, 0x62, 0xc3, 0x47, 0x5c,
+	0x4d, 0xbc, 0xe9, 0x1a, 0x39, 0xb6, 0x83, 0xf8, 0x87, 0x1d, 0x20, 0x8e, 0x7f, 0xaa, 0x13, 0xc6,
+	0xf1, 0x4f, 0x37, 0x0e, 0xe5, 0xe2, 0xbb, 0xb8, 0x01, 0x4d, 0x94, 0x41, 0x66, 0xa4, 0xef, 0x6b,
+	0xb2, 0x29, 0x54, 0x17, 0x8f, 0x94, 0x09, 0xce, 0xd8, 0xd7, 0xd5, 0xbf, 0x24, 0x5f, 0xf8, 0x2b,
+	0x00, 0x00, 0xff, 0xff, 0x35, 0x0f, 0xad, 0x07, 0xbc, 0x1c, 0x00, 0x00,
 }
diff --git a/vendor/vendor.json b/vendor/vendor.json
index c6a2b7c6f..b2eb2a724 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -315,12 +315,12 @@
 			"versionExact": "v1.2.2"
 		},
 		{
-			"checksumSHA1": "C1VkHf9tBfLl56Vy8GS6Fk6AWcc=",
+			"checksumSHA1": "vGq4vcEP5tPA3UN7kNtpAvbDXVA=",
 			"path": "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb",
-			"revision": "c8b4ff89954ef4edcdad214dc696f487d4243978",
-			"revisionTime": "2018-11-05T14:00:44Z",
-			"version": "v0.123.0",
-			"versionExact": "v0.123.0"
+			"revision": "d9a75fddb25992464bc2ea7d94adbbc74d547685",
+			"revisionTime": "2018-11-23T12:56:34Z",
+			"version": "v0.124.0",
+			"versionExact": "v0.124.0"
 		},
 		{
 			"checksumSHA1": "S9x46Eq79I1EkoXI8woeIU6w/wY=",