Merge branch 'pass-through-skip-ci-flag' into 'master'

Allow git_push_options to be passed to UserRebaseConfirmable RPC

See merge request gitlab-org/gitaly!1748

13 files changed, 296 insertions, 157 deletions

diff --git a/changelogs/unreleased/pass-through-skip-ci-flag.yml b/changelogs/unreleased/pass-through-skip-ci-flag.yml
new file mode 100644
index 000000000..d63a86992
--- /dev/null
+++ b/changelogs/unreleased/pass-through-skip-ci-flag.yml
@@ -0,0 +1,5 @@
+---
+title: Allow git_push_options to be passed to UserRebaseConfirmable RPC
+merge_request: 1748
+author:
+type: added
diff --git a/internal/service/operations/rebase_test.go b/internal/service/operations/rebase_test.go
index ad8c3295e..b98dca223 100644
--- a/internal/service/operations/rebase_test.go
+++ b/internal/service/operations/rebase_test.go
@@ -5,6 +5,7 @@ package operations_test
 import (
 	"errors"
 	"fmt"
+	"os"
 	"strings"
 	"testing"
 	"time"
@@ -29,6 +30,8 @@ var (
 )
 
 func TestSuccessfulUserRebaseConfirmableRequest(t *testing.T) {
+	pushOptions := []string{"ci.skip", "test=value"}
+
 	ctxOuter, cancel := testhelper.Context()
 	defer cancel()
 
@@ -52,7 +55,13 @@ func TestSuccessfulUserRebaseConfirmableRequest(t *testing.T) {
 	rebaseStream, err := client.UserRebaseConfirmable(ctx)
 	require.NoError(t, err)
 
+	preReceiveHookOutputPath := operations.WriteEnvToHook(t, testRepoPath, "pre-receive")
+	postReceiveHookOutputPath := operations.WriteEnvToHook(t, testRepoPath, "post-receive")
+	defer os.Remove(preReceiveHookOutputPath)
+	defer os.Remove(postReceiveHookOutputPath)
+
 	headerRequest := buildHeaderRequest(testRepo, rebaseUser, "1", branchName, branchSha, testRepoCopy, "master")
+	headerRequest.GetHeader().GitPushOptions = pushOptions
 	require.NoError(t, rebaseStream.Send(headerRequest), "send header")
 
 	firstResponse, err := rebaseStream.Recv()
@@ -79,6 +88,13 @@ func TestSuccessfulUserRebaseConfirmableRequest(t *testing.T) {
 	require.Equal(t, newBranchSha, firstResponse.GetRebaseSha())
 
 	require.True(t, secondResponse.GetRebaseApplied(), "the second rebase is applied")
+
+	for _, outputPath := range []string{preReceiveHookOutputPath, postReceiveHookOutputPath} {
+		output := string(testhelper.MustReadFile(t, outputPath))
+		require.Contains(t, output, "GIT_PUSH_OPTION_COUNT=2")
+		require.Contains(t, output, "GIT_PUSH_OPTION_0=ci.skip")
+		require.Contains(t, output, "GIT_PUSH_OPTION_1=test=value")
+	}
 }
 
 func TestFailedRebaseUserRebaseConfirmableRequestDueToInvalidHeader(t *testing.T) {
diff --git a/proto/go/gitalypb/operations.pb.go b/proto/go/gitalypb/operations.pb.go
index ac358ee14..886d071c1 100644
--- a/proto/go/gitalypb/operations.pb.go
+++ b/proto/go/gitalypb/operations.pb.go
@@ -2063,6 +2063,7 @@ type UserRebaseConfirmableRequest_Header struct {
 	BranchSha            string      `protobuf:"bytes,5,opt,name=branch_sha,json=branchSha,proto3" json:"branch_sha,omitempty"`
 	RemoteRepository     *Repository `protobuf:"bytes,6,opt,name=remote_repository,json=remoteRepository,proto3" json:"remote_repository,omitempty"`
 	RemoteBranch         []byte      `protobuf:"bytes,7,opt,name=remote_branch,json=remoteBranch,proto3" json:"remote_branch,omitempty"`
+	GitPushOptions       []string    `protobuf:"bytes,8,rep,name=git_push_options,json=gitPushOptions,proto3" json:"git_push_options,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
 	XXX_unrecognized     []byte      `json:"-"`
 	XXX_sizecache        int32       `json:"-"`
@@ -2142,6 +2143,13 @@ func (m *UserRebaseConfirmableRequest_Header) GetRemoteBranch() []byte {
 	return nil
 }
 
+func (m *UserRebaseConfirmableRequest_Header) GetGitPushOptions() []string {
+	if m != nil {
+		return m.GitPushOptions
+	}
+	return nil
+}
+
 type UserRebaseConfirmableResponse struct {
 	// Types that are valid to be assigned to UserRebaseConfirmableResponsePayload:
 	//	*UserRebaseConfirmableResponse_RebaseSha
@@ -2737,141 +2745,143 @@ func init() {
 func init() { proto.RegisterFile("operations.proto", fileDescriptor_1b4a5877375e491e) }
 
 var fileDescriptor_1b4a5877375e491e = []byte{
-	// 2139 bytes of a gzipped FileDescriptorProto
+	// 2168 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x5a, 0xcd, 0x6f, 0x23, 0x49,
 	0x15, 0x4f, 0xdb, 0x8e, 0xe3, 0xbc, 0x38, 0x89, 0x53, 0xb3, 0x3b, 0xeb, 0xf5, 0x4c, 0x98, 0x6c,
-	0x67, 0x86, 0xc9, 0x0c, 0xe0, 0xf9, 0x60, 0x05, 0x12, 0xd2, 0x82, 0x26, 0x8e, 0x43, 0x66, 0xb5,
-	0xf9, 0xa0, 0xe3, 0x01, 0xb1, 0x42, 0x34, 0x1d, 0xbb, 0x6c, 0xb7, 0xb0, 0xdd, 0xde, 0xea, 0x76,
-	0x98, 0x70, 0x40, 0x48, 0x48, 0x2c, 0x47, 0x4e, 0x2c, 0x17, 0x24, 0x38, 0x21, 0x21, 0x2e, 0x5c,
-	0x10, 0xe2, 0x80, 0x90, 0x38, 0xc1, 0x95, 0x3b, 0x7f, 0x00, 0x07, 0x0e, 0x20, 0x2e, 0x7b, 0x42,
-	0x55, 0xef, 0xb5, 0xdd, 0xd5, 0xdd, 0xce, 0x26, 0x4b, 0xac, 0x1d, 0xd0, 0xde, 0xe2, 0x57, 0xaf,
-	0x5f, 0xbd, 0xf7, 0x7b, 0x9f, 0x55, 0x15, 0x28, 0x79, 0x43, 0x2e, 0x9c, 0xc0, 0xf5, 0x06, 0x7e,
-	0x75, 0x28, 0xbc, 0xc0, 0x63, 0xf9, 0x8e, 0x1b, 0x38, 0xbd, 0xb3, 0x4a, 0xd1, 0xef, 0x3a, 0x82,
-	0xb7, 0x90, 0x6a, 0xfe, 0xc6, 0x80, 0x57, 0x9e, 0xf9, 0x5c, 0xd4, 0x04, 0x77, 0x02, 0xbe, 0x2d,
-	0x9c, 0x41, 0xb3, 0x6b, 0xf1, 0x77, 0x46, 0xdc, 0x0f, 0xd8, 0x63, 0x00, 0xc1, 0x87, 0x9e, 0xef,
-	0x06, 0x9e, 0x38, 0x2b, 0x1b, 0x1b, 0xc6, 0xd6, 0xd2, 0x63, 0x56, 0x45, 0x31, 0x55, 0x6b, 0xbc,
-	0x62, 0x45, 0xb8, 0xd8, 0x2d, 0x58, 0x3a, 0x51, 0x42, 0xec, 0x81, 0xd3, 0xe7, 0xe5, 0xcc, 0x86,
-	0xb1, 0x55, 0xb4, 0x00, 0x49, 0x07, 0x4e, 0x9f, 0xb3, 0x0d, 0xc8, 0x8d, 0x7c, 0x2e, 0xca, 0x59,
-	0x25, 0xae, 0x18, 0x8a, 0x93, 0x3a, 0x58, 0x6a, 0x45, 0x8a, 0xf0, 0x03, 0x47, 0x04, 0xf6, 0xd0,
-	0x73, 0x07, 0x41, 0x39, 0x87, 0x22, 0x14, 0xe9, 0x48, 0x52, 0xcc, 0x01, 0x94, 0x93, 0x2a, 0xfb,
-	0x43, 0x6f, 0xe0, 0x73, 0xf6, 0x49, 0xc8, 0xe3, 0x66, 0xa4, 0xef, 0x4a, 0xb8, 0x01, 0xf1, 0xd1,
-	0x2a, 0xbb, 0x0f, 0x6b, 0x43, 0xc1, 0x6d, 0xc1, 0x9b, 0xdc, 0x3d, 0xe5, 0x36, 0x17, 0xc2, 0x13,
-	0x4a, 0xdb, 0x45, 0x6b, 0x75, 0x28, 0xb8, 0x85, 0xf4, 0xba, 0x24, 0x9b, 0x7f, 0x24, 0x8c, 0x9e,
-	0x0d, 0x5b, 0x2f, 0x0a, 0x46, 0xd7, 0x21, 0x3f, 0xe0, 0xdf, 0x11, 0xfc, 0x94, 0xe0, 0xa1, 0x5f,
-	0x92, 0xee, 0xf5, 0x5a, 0x92, 0x3e, 0x8f, 0x74, 0xfc, 0x65, 0xee, 0x22, 0x64, 0xba, 0x05, 0x04,
-	0x59, 0x2a, 0x14, 0x46, 0x3a, 0x14, 0x3f, 0x26, 0x28, 0x76, 0x78, 0x8f, 0xbf, 0x18, 0x50, 0x84,
-	0xa6, 0xe9, 0x1a, 0x7d, 0x08, 0xd3, 0xde, 0x35, 0xe0, 0xa5, 0x89, 0xa0, 0x86, 0xd3, 0xf9, 0x6f,
-	0xec, 0x7a, 0x15, 0x0a, 0x81, 0xd3, 0x89, 0x1a, 0xb5, 0x10, 0x38, 0x9d, 0x0b, 0x5a, 0x54, 0x83,
-	0x97, 0x63, 0x8a, 0x7c, 0x08, 0x73, 0xfe, 0x42, 0xe6, 0x60, 0x96, 0x7c, 0x84, 0xe6, 0xb0, 0xbb,
-	0xb0, 0x1a, 0x38, 0xa2, 0xc3, 0x03, 0x5b, 0xf0, 0x53, 0xd7, 0x77, 0xbd, 0x01, 0x05, 0xed, 0x0a,
-	0x92, 0x2d, 0xa2, 0xb2, 0x32, 0x2c, 0xf4, 0xb9, 0xef, 0x3b, 0x1d, 0x4e, 0xd1, 0x1b, 0xfe, 0x34,
-	0xbf, 0x8b, 0x88, 0x44, 0x6c, 0x21, 0x44, 0xd6, 0x21, 0x1b, 0x38, 0x1d, 0xb2, 0x62, 0x29, 0xdc,
-	0x5c, 0x72, 0x48, 0xba, 0x4c, 0x07, 0xfe, 0xdc, 0xf5, 0x03, 0x5f, 0x69, 0x5d, 0xb0, 0xe8, 0x57,
-	0x3a, 0x90, 0xd9, 0x74, 0x20, 0xff, 0x6a, 0xc0, 0x75, 0xb9, 0xf9, 0x3e, 0x17, 0x9d, 0x2b, 0x88,
-	0xf8, 0x10, 0xaf, 0xcc, 0x54, 0xbc, 0x6e, 0xc0, 0x62, 0xd3, 0xeb, 0xf7, 0xdd, 0xc0, 0x76, 0x5b,
-	0xa4, 0x54, 0x01, 0x09, 0x4f, 0x5b, 0xd2, 0x22, 0xaa, 0x6f, 0x94, 0xf8, 0x54, 0xcf, 0xa6, 0x62,
-	0xc7, 0x5e, 0x82, 0x79, 0x67, 0x38, 0xec, 0x9d, 0x95, 0xf3, 0x0a, 0x02, 0xfc, 0x61, 0xfe, 0x9a,
-	0x12, 0x59, 0xb3, 0x8a, 0x40, 0xd5, 0x14, 0x30, 0x62, 0x0a, 0x6c, 0xc3, 0x32, 0x65, 0xec, 0x48,
-	0x15, 0x13, 0x72, 0xfc, 0x7a, 0x68, 0xc8, 0x61, 0xd8, 0x77, 0x50, 0x28, 0x56, 0x1c, 0xab, 0x78,
-	0x12, 0xf9, 0x95, 0x0e, 0x7f, 0x2e, 0x15, 0xfe, 0x37, 0x73, 0x85, 0x4c, 0x29, 0x6b, 0xbe, 0x9b,
-	0xc1, 0x08, 0x50, 0xea, 0x36, 0x3c, 0x8b, 0xb7, 0x67, 0xeb, 0x83, 0x75, 0x00, 0xdf, 0x1b, 0x89,
-	0x26, 0xb7, 0xfd, 0xae, 0x43, 0x4e, 0x58, 0x44, 0xca, 0x71, 0xd7, 0x99, 0xea, 0x85, 0x75, 0x80,
-	0x71, 0xa8, 0xb7, 0xc9, 0x11, 0x8b, 0x61, 0x94, 0xb7, 0xa3, 0x4e, 0xca, 0xeb, 0x4e, 0xda, 0x82,
-	0x52, 0xdb, 0x15, 0x7e, 0x60, 0x0f, 0x1d, 0xc1, 0x07, 0xf8, 0xf9, 0x02, 0x26, 0x89, 0xa2, 0x1f,
-	0x29, 0xb2, 0xc5, 0xdb, 0xa6, 0x13, 0x89, 0x46, 0x02, 0xe2, 0x22, 0x6e, 0xbb, 0x4c, 0xbf, 0xfb,
-	0x1e, 0xbc, 0x9c, 0xea, 0xc5, 0xf3, 0x77, 0x78, 0x0d, 0x8a, 0x12, 0x62, 0xbb, 0xa9, 0x92, 0xb4,
-	0x45, 0x19, 0xb7, 0x24, 0x69, 0x98, 0xb7, 0x2d, 0x76, 0x07, 0x56, 0x28, 0x76, 0x42, 0xa6, 0xac,
-	0x62, 0xa2, 0x88, 0x22, 0x36, 0xf3, 0xe7, 0x06, 0x5c, 0x93, 0x36, 0xee, 0xee, 0xbe, 0xa8, 0xe9,
-	0x66, 0xfe, 0x90, 0xaa, 0xeb, 0x44, 0x45, 0x72, 0x42, 0x22, 0x3d, 0x8c, 0x2b, 0x4a, 0x8f, 0x29,
-	0xbe, 0xfa, 0x03, 0x25, 0x46, 0xad, 0xcb, 0x85, 0x38, 0x3b, 0x72, 0x9b, 0xdf, 0x9e, 0x2d, 0x5a,
-	0xf7, 0x20, 0x8f, 0xe0, 0x50, 0xde, 0xaf, 0x85, 0x3c, 0x5f, 0x76, 0x83, 0x9a, 0x5a, 0xb0, 0x88,
-	0x21, 0xde, 0xdb, 0x73, 0x89, 0xde, 0x3e, 0xbd, 0x66, 0xdd, 0x87, 0x35, 0x1c, 0x01, 0xa3, 0x02,
-	0x30, 0x65, 0x56, 0xd5, 0xc2, 0xf6, 0x44, 0xca, 0x1b, 0x50, 0x42, 0xde, 0x88, 0xb5, 0x0b, 0x53,
-	0xad, 0xc5, 0xcf, 0x27, 0x04, 0xf3, 0x9f, 0x19, 0x4c, 0xa8, 0x28, 0x80, 0x57, 0xeb, 0x4b, 0x8c,
-	0x75, 0x3b, 0x10, 0x3c, 0xe6, 0x4b, 0x5c, 0x68, 0x08, 0x8e, 0xbe, 0x94, 0x19, 0x44, 0x91, 0x18,
-	0x6d, 0x48, 0x4b, 0x48, 0x43, 0x96, 0x4b, 0x54, 0x4e, 0xd6, 0x84, 0xeb, 0x89, 0xad, 0xed, 0xa6,
-	0xd7, 0x42, 0xb4, 0x57, 0x1e, 0x57, 0xa3, 0xee, 0x4d, 0x9a, 0x5f, 0xad, 0xe9, 0xea, 0x59, 0xd7,
-	0x62, 0xfa, 0xd6, 0xbc, 0x16, 0x37, 0x5f, 0x87, 0xd5, 0x18, 0x1f, 0x2b, 0x40, 0xee, 0xe0, 0xf0,
-	0xa0, 0x5e, 0x9a, 0x63, 0x8b, 0x30, 0x5f, 0xdf, 0x3f, 0x6a, 0x7c, 0xbd, 0x64, 0xb0, 0x22, 0x14,
-	0x6a, 0x87, 0x07, 0xbb, 0x6f, 0x3d, 0xad, 0x35, 0x4a, 0x19, 0xf3, 0xf7, 0x19, 0x58, 0x53, 0x41,
-	0xc5, 0x4f, 0xb9, 0xf4, 0xc6, 0xc7, 0x11, 0x7b, 0x89, 0x88, 0xfd, 0x7b, 0x06, 0x58, 0x14, 0xbc,
-	0xff, 0x8f, 0x68, 0xb5, 0x3f, 0x20, 0x5a, 0xef, 0x6b, 0xae, 0xd5, 0x4c, 0x9f, 0x65, 0xa4, 0xfe,
-	0x3b, 0x03, 0x37, 0x54, 0x7e, 0x28, 0xb3, 0x76, 0xdd, 0x1e, 0xf7, 0x9f, 0x34, 0x25, 0x8a, 0x7b,
-	0xdc, 0x69, 0x71, 0xc1, 0x76, 0x21, 0xef, 0xa8, 0xdf, 0x0a, 0xee, 0x78, 0x52, 0xa5, 0x7f, 0x54,
-	0xc5, 0x1f, 0x8d, 0xb3, 0x21, 0xb7, 0xe8, 0x6b, 0xd9, 0x85, 0xda, 0x6e, 0x8f, 0xdb, 0x43, 0x27,
-	0xe8, 0xd2, 0x88, 0x5d, 0x90, 0x84, 0x23, 0x27, 0xe8, 0xb2, 0x4d, 0x58, 0x1e, 0xca, 0xd9, 0xd9,
-	0x1b, 0xf9, 0xc8, 0x90, 0x55, 0x0c, 0xc5, 0x90, 0xa8, 0x98, 0x64, 0x73, 0x75, 0x7c, 0xfe, 0xb9,
-	0xd7, 0xed, 0xa6, 0x37, 0x08, 0x38, 0x9d, 0x9c, 0x65, 0x73, 0x55, 0xd4, 0x1a, 0x12, 0xd9, 0x3d,
-	0x28, 0xf1, 0xe7, 0xbc, 0x39, 0x0a, 0xb8, 0x2d, 0xe5, 0xf7, 0x43, 0x84, 0x0b, 0xd6, 0x2a, 0xd1,
-	0x77, 0x89, 0x2c, 0xb7, 0x75, 0x07, 0x6d, 0x2e, 0xc6, 0x02, 0x71, 0x82, 0x2c, 0x2a, 0x22, 0xc9,
-	0x33, 0x9f, 0x01, 0x4c, 0xcc, 0x61, 0x00, 0xf9, 0x9a, 0x55, 0x7f, 0xd2, 0x90, 0x98, 0xae, 0x00,
-	0xe0, 0xdf, 0xf6, 0xce, 0x53, 0xab, 0x64, 0xc8, 0xb5, 0x67, 0x47, 0x3b, 0x72, 0x2d, 0x23, 0x91,
-	0xdf, 0x3f, 0xfc, 0x6a, 0xbd, 0x94, 0x95, 0xd4, 0x9d, 0xfa, 0x5b, 0xf5, 0x46, 0xbd, 0x94, 0x93,
-	0x5e, 0xa8, 0xed, 0xed, 0x1f, 0xee, 0x94, 0xe6, 0xcd, 0x9f, 0x18, 0xd4, 0xd7, 0xe2, 0x10, 0xb2,
-	0x37, 0x20, 0xdf, 0x55, 0x30, 0x52, 0x80, 0x6f, 0x5e, 0x00, 0xf1, 0xbd, 0x39, 0x8b, 0x3e, 0x62,
-	0x15, 0x58, 0x08, 0xcd, 0x51, 0x30, 0xef, 0xcd, 0x59, 0x21, 0x61, 0xdb, 0x84, 0x0d, 0x59, 0x32,
-	0x6c, 0x8a, 0x6b, 0x89, 0x8f, 0x6f, 0xa3, 0x83, 0xec, 0xa1, 0x73, 0xd6, 0xf3, 0x9c, 0x96, 0xf9,
-	0xbb, 0x2c, 0xdc, 0x8c, 0xed, 0x44, 0xf5, 0x8b, 0x22, 0x62, 0x36, 0x55, 0x2c, 0x56, 0x9a, 0xb2,
-	0x89, 0xd2, 0x74, 0x07, 0x56, 0x48, 0xed, 0xb0, 0x42, 0x61, 0xf9, 0x5a, 0x46, 0xea, 0x3e, 0xd5,
-	0xa9, 0x4f, 0x03, 0x23, 0x36, 0x67, 0x14, 0x74, 0x3d, 0x81, 0xe2, 0xb0, 0x98, 0x95, 0x70, 0xe5,
-	0x89, 0x5a, 0x50, 0x42, 0xab, 0x70, 0x4d, 0xe7, 0xe6, 0x7d, 0xc7, 0xed, 0x51, 0x5d, 0x5b, 0x8b,
-	0xb2, 0xd7, 0xe5, 0x42, 0x7a, 0x15, 0x5c, 0xb8, 0x78, 0x15, 0x2c, 0x5c, 0xb8, 0x0a, 0xca, 0x63,
-	0x4d, 0xdb, 0x13, 0x4d, 0x5e, 0x5e, 0xc4, 0x63, 0x8d, 0xfa, 0x21, 0xd3, 0x08, 0x85, 0xca, 0xb1,
-	0x1d, 0x70, 0x98, 0x53, 0x84, 0xe3, 0xae, 0x63, 0xfe, 0x96, 0x4e, 0x72, 0x49, 0xd7, 0xb1, 0x2f,
-	0xc6, 0x82, 0xea, 0xf6, 0x94, 0xa0, 0xd2, 0x5c, 0x1d, 0x89, 0xaa, 0xcf, 0x8f, 0xcb, 0x40, 0x46,
-	0xaf, 0xba, 0xe9, 0x41, 0x39, 0x17, 0xe6, 0xfd, 0xf6, 0x26, 0xbc, 0x96, 0x0c, 0x39, 0x81, 0xbb,
-	0x8c, 0x63, 0xee, 0x57, 0xe1, 0x25, 0x5d, 0x54, 0x91, 0x2b, 0x2c, 0xfb, 0xb7, 0x60, 0xc9, 0x1d,
-	0xb4, 0xf8, 0x73, 0xad, 0xe0, 0x83, 0x22, 0x9d, 0x53, 0xc8, 0xa7, 0x9c, 0x97, 0x7f, 0x39, 0xee,
-	0xed, 0xb2, 0xf0, 0xcc, 0x7c, 0x76, 0x17, 0x6a, 0x9b, 0xc8, 0xec, 0x8e, 0x84, 0x73, 0x8e, 0xca,
-	0xeb, 0x40, 0x79, 0xa3, 0x82, 0x64, 0x1e, 0xcf, 0x76, 0x48, 0x91, 0x67, 0xbb, 0x2f, 0xc1, 0x9a,
-	0xe0, 0x7d, 0x2f, 0xe0, 0xd1, 0xc0, 0xcc, 0x4f, 0x55, 0xb8, 0x84, 0xcc, 0x91, 0xc8, 0xdc, 0x84,
-	0x65, 0x12, 0x40, 0xdb, 0x63, 0x02, 0x14, 0x91, 0x88, 0x6e, 0xf8, 0x42, 0xa6, 0x6c, 0x98, 0xdf,
-	0x37, 0xc2, 0x46, 0x8e, 0x48, 0x8d, 0xef, 0x34, 0x80, 0x8c, 0x92, 0xfa, 0xe1, 0x31, 0x8b, 0xcc,
-	0x94, 0xfa, 0x5d, 0xe2, 0x74, 0x20, 0xf1, 0xe9, 0xc4, 0x1a, 0x74, 0xa1, 0x43, 0xdd, 0x59, 0xa9,
-	0xf0, 0x27, 0xaa, 0x66, 0xa8, 0x42, 0xcd, 0x1b, 0xb4, 0x5d, 0xd1, 0x77, 0x4e, 0x7a, 0x63, 0xbf,
-	0xd5, 0x63, 0x89, 0xf1, 0x29, 0xbd, 0x0d, 0xa7, 0x7f, 0x55, 0x4d, 0xe4, 0xc7, 0xf5, 0xf0, 0x12,
-	0x42, 0x9d, 0x0a, 0xf7, 0xe6, 0xe8, 0x1a, 0xa2, 0xf2, 0xd3, 0x0c, 0xe4, 0x67, 0x5a, 0x37, 0xff,
-	0x67, 0x23, 0x64, 0xfb, 0x1e, 0xdc, 0x55, 0x95, 0x81, 0xd4, 0x6f, 0x4e, 0x50, 0x4e, 0xd4, 0x87,
-	0xbf, 0x19, 0xb0, 0x3e, 0xc5, 0x1f, 0x14, 0x53, 0xb7, 0x92, 0x31, 0xb5, 0x37, 0x17, 0x8d, 0xaa,
-	0xbb, 0xb0, 0x42, 0x0c, 0xd2, 0x31, 0x6e, 0x78, 0x7e, 0xdf, 0x9b, 0xb3, 0x96, 0x91, 0xfe, 0x04,
-	0xc9, 0x97, 0x29, 0x05, 0x7a, 0xf8, 0xe5, 0xf4, 0xf0, 0xdb, 0xbe, 0x0f, 0x5b, 0xd3, 0xed, 0x43,
-	0xb5, 0xc7, 0x06, 0xfe, 0x82, 0x6a, 0xca, 0xf1, 0x3b, 0x23, 0xc7, 0x9f, 0xfd, 0x7d, 0x80, 0xaf,
-	0xb6, 0x89, 0x44, 0x0c, 0x12, 0xce, 0x89, 0x18, 0xad, 0xef, 0xcc, 0xeb, 0x7d, 0x87, 0xbd, 0x02,
-	0x0b, 0x7c, 0xd0, 0x52, 0x4b, 0x79, 0xb5, 0x94, 0xe7, 0x83, 0x96, 0x5c, 0xb8, 0x0d, 0x79, 0xec,
-	0xab, 0x34, 0xfe, 0xeb, 0xea, 0xd0, 0x5a, 0x4a, 0x67, 0x2f, 0xa4, 0x74, 0x76, 0xd3, 0xc5, 0x62,
-	0x12, 0x42, 0x34, 0x29, 0x26, 0x64, 0x4d, 0xa4, 0x98, 0x20, 0x45, 0x6a, 0x70, 0x5e, 0x81, 0xc0,
-	0xab, 0x37, 0x2b, 0xe9, 0x6e, 0xf3, 0x67, 0x74, 0xe9, 0x20, 0x63, 0xe2, 0xec, 0xc8, 0x09, 0x26,
-	0x57, 0x34, 0xe7, 0xf6, 0xd1, 0x04, 0x7b, 0x35, 0x6d, 0x3a, 0x1b, 0x4a, 0x06, 0xee, 0x4f, 0xa6,
-	0x33, 0x22, 0x54, 0x7e, 0x60, 0xcc, 0xb8, 0x56, 0x6c, 0xc2, 0x32, 0xdd, 0xde, 0x91, 0x8f, 0x69,
-	0xcc, 0x46, 0x22, 0xa5, 0x65, 0x38, 0x23, 0xaa, 0xfa, 0x65, 0x2b, 0xdd, 0x12, 0xf9, 0xf8, 0x0d,
-	0x9c, 0x33, 0xa2, 0xf6, 0x5e, 0x5d, 0xb7, 0x36, 0xff, 0x61, 0x40, 0x65, 0xf2, 0x98, 0x73, 0x3c,
-	0x3a, 0xe9, 0x7b, 0xad, 0x51, 0x8f, 0xcf, 0xfc, 0x42, 0x94, 0x82, 0x30, 0x72, 0x21, 0x8a, 0x94,
-	0xf3, 0x2e, 0x44, 0x6f, 0xc2, 0xa2, 0x1f, 0x2a, 0x18, 0xde, 0x87, 0x8e, 0x09, 0x29, 0x91, 0x9d,
-	0x4f, 0x8b, 0xec, 0x3f, 0x1b, 0x78, 0x06, 0x4b, 0x18, 0xfc, 0xd1, 0xdc, 0xb9, 0x25, 0x4e, 0xbe,
-	0xb9, 0xc4, 0xc9, 0xf7, 0xcd, 0x5c, 0x21, 0x5b, 0xca, 0x59, 0xc9, 0xc3, 0xf4, 0xe3, 0x7f, 0x2d,
-	0x41, 0x69, 0xac, 0xcf, 0x31, 0x17, 0xa7, 0x6e, 0x93, 0xb3, 0x6f, 0x41, 0x29, 0xfe, 0xa0, 0xc9,
-	0x6e, 0x69, 0x13, 0x64, 0xf2, 0x75, 0xb6, 0xb2, 0x31, 0x9d, 0x01, 0x71, 0x31, 0x17, 0xdf, 0x7f,
-	0x6f, 0x6b, 0xbe, 0x60, 0x54, 0x8c, 0x47, 0xe1, 0x0e, 0xd1, 0xf7, 0x3f, 0x7d, 0x87, 0x94, 0xb7,
-	0x4d, 0x7d, 0x87, 0xb4, 0xa7, 0xc3, 0x94, 0x1d, 0xa2, 0xcf, 0x70, 0xfa, 0x0e, 0x29, 0x4f, 0x86,
-	0xfa, 0x0e, 0x69, 0x2f, 0x78, 0xd1, 0x1d, 0xbe, 0x06, 0xcb, 0xda, 0x23, 0x10, 0xbb, 0x99, 0x44,
-	0x60, 0xf2, 0xce, 0x55, 0x59, 0x9f, 0xb2, 0x3a, 0x55, 0xf0, 0xf8, 0xbd, 0x4d, 0x17, 0x1c, 0x7f,
-	0x0f, 0xd4, 0x05, 0x27, 0x1e, 0xe9, 0xa2, 0x82, 0xdf, 0x86, 0x15, 0xfd, 0xae, 0x9e, 0x69, 0xdf,
-	0x26, 0x1e, 0x33, 0x2a, 0x9f, 0x98, 0xb6, 0x9c, 0x94, 0xed, 0xc0, 0x6a, 0xec, 0xfd, 0x86, 0x25,
-	0xbf, 0xd6, 0xd1, 0xbe, 0x35, 0x75, 0x3d, 0x21, 0x7e, 0xcb, 0x78, 0x68, 0xb0, 0x06, 0x14, 0xa3,
-	0x77, 0xdc, 0xec, 0x46, 0xf4, 0xfb, 0xd8, 0xe5, 0x7c, 0xe5, 0x66, 0xfa, 0xe2, 0x54, 0x50, 0x26,
-	0x17, 0x8e, 0x3a, 0x28, 0x89, 0x8b, 0x6c, 0x1d, 0x94, 0xe4, 0x3d, 0x65, 0x0a, 0x28, 0x91, 0x73,
-	0x92, 0x0e, 0x4a, 0xf2, 0x24, 0xa7, 0x83, 0x92, 0x72, 0xc0, 0x32, 0x97, 0xde, 0x7f, 0x6f, 0x6b,
-	0xa1, 0x60, 0x54, 0xb2, 0x8f, 0xaa, 0x8f, 0xb6, 0x0c, 0xf6, 0x15, 0x80, 0xc9, 0xa8, 0xc5, 0x5e,
-	0x4d, 0x8e, 0xc3, 0xa1, 0xe0, 0x4a, 0xda, 0x12, 0xc9, 0x2c, 0x8e, 0x55, 0xfe, 0x51, 0xc6, 0x60,
-	0x23, 0xec, 0xa6, 0x89, 0xe9, 0x8d, 0xdd, 0xbe, 0xc8, 0xb0, 0x5d, 0xb9, 0xf3, 0x01, 0x5c, 0xa9,
-	0x76, 0x3c, 0x34, 0xd8, 0x41, 0x68, 0xc9, 0x29, 0x17, 0x41, 0xdc, 0x92, 0xc8, 0xbd, 0x6c, 0xdc,
-	0x92, 0xe8, 0xd5, 0x5b, 0x14, 0x7c, 0x92, 0x87, 0x03, 0x88, 0x2e, 0x4f, 0x9b, 0xdb, 0x74, 0x79,
-	0xfa, 0xbc, 0x12, 0x95, 0xf7, 0x4d, 0x0c, 0x94, 0x49, 0x17, 0xd5, 0x03, 0x25, 0x31, 0x4d, 0xe8,
-	0x81, 0x92, 0x6c, 0xbe, 0x71, 0x4f, 0xba, 0xf8, 0xca, 0x14, 0xeb, 0x2a, 0xcc, 0x4c, 0x56, 0xbd,
-	0x78, 0x8f, 0xad, 0x6c, 0x9e, 0xcb, 0x93, 0x30, 0x65, 0xfb, 0xe1, 0xdb, 0xf2, 0x83, 0x9e, 0x73,
-	0x52, 0x6d, 0x7a, 0xfd, 0x07, 0xf8, 0xe7, 0x67, 0x3c, 0xd1, 0x79, 0x80, 0x62, 0x1e, 0xa8, 0xff,
-	0xc5, 0x79, 0xd0, 0xf1, 0xe8, 0xf7, 0xf0, 0xe4, 0x24, 0xaf, 0x48, 0x9f, 0xfd, 0x4f, 0x00, 0x00,
-	0x00, 0xff, 0xff, 0x81, 0xd4, 0x1b, 0xc8, 0xc8, 0x23, 0x00, 0x00,
+	0x67, 0x86, 0xf1, 0x0c, 0xe0, 0xf9, 0x60, 0x05, 0x12, 0xd2, 0x82, 0x26, 0x8e, 0x43, 0x66, 0xb5,
+	0xf9, 0xa0, 0x93, 0x01, 0xb1, 0x42, 0x34, 0x1d, 0xbb, 0x62, 0xb7, 0xb0, 0xdd, 0xbd, 0xd5, 0xed,
+	0x30, 0xe1, 0x80, 0x90, 0x90, 0x58, 0x8e, 0x9c, 0xd8, 0x13, 0x12, 0x9c, 0x90, 0x10, 0x17, 0x2e,
+	0x08, 0x71, 0x40, 0x88, 0x1b, 0x5c, 0xb9, 0xf3, 0x07, 0x20, 0xc1, 0x01, 0xc4, 0x65, 0x4f, 0xa8,
+	0xea, 0xbd, 0xb6, 0xbb, 0xba, 0xdb, 0xd9, 0x64, 0x49, 0xb4, 0x03, 0xda, 0x5b, 0xfc, 0xea, 0xf5,
+	0xab, 0xf7, 0x7e, 0xef, 0xb3, 0xaa, 0x02, 0x15, 0xcf, 0xe7, 0xc2, 0x09, 0x5d, 0x6f, 0x18, 0x34,
+	0x7c, 0xe1, 0x85, 0x1e, 0x2b, 0x76, 0xdd, 0xd0, 0xe9, 0x9f, 0xd6, 0xca, 0x41, 0xcf, 0x11, 0xbc,
+	0x83, 0x54, 0xf3, 0xd7, 0x06, 0xbc, 0xf2, 0x2c, 0xe0, 0xa2, 0x29, 0xb8, 0x13, 0xf2, 0x0d, 0xe1,
+	0x0c, 0xdb, 0x3d, 0x8b, 0xbf, 0x33, 0xe2, 0x41, 0xc8, 0x1e, 0x03, 0x08, 0xee, 0x7b, 0x81, 0x1b,
+	0x7a, 0xe2, 0xb4, 0x6a, 0xac, 0x19, 0xf5, 0x85, 0xc7, 0xac, 0x81, 0x62, 0x1a, 0xd6, 0x78, 0xc5,
+	0x8a, 0x71, 0xb1, 0x5b, 0xb0, 0x70, 0xa4, 0x84, 0xd8, 0x43, 0x67, 0xc0, 0xab, 0xb9, 0x35, 0xa3,
+	0x5e, 0xb6, 0x00, 0x49, 0xbb, 0xce, 0x80, 0xb3, 0x35, 0x28, 0x8c, 0x02, 0x2e, 0xaa, 0x79, 0x25,
+	0xae, 0x1c, 0x89, 0x93, 0x3a, 0x58, 0x6a, 0x45, 0x8a, 0x08, 0x42, 0x47, 0x84, 0xb6, 0xef, 0xb9,
+	0xc3, 0xb0, 0x5a, 0x40, 0x11, 0x8a, 0xb4, 0x2f, 0x29, 0xe6, 0x10, 0xaa, 0x69, 0x95, 0x03, 0xdf,
+	0x1b, 0x06, 0x9c, 0x7d, 0x12, 0x8a, 0xb8, 0x19, 0xe9, 0xbb, 0x14, 0x6d, 0x40, 0x7c, 0xb4, 0xca,
+	0xee, 0xc3, 0x8a, 0x2f, 0xb8, 0x2d, 0x78, 0x9b, 0xbb, 0x27, 0xdc, 0xe6, 0x42, 0x78, 0x42, 0x69,
+	0x3b, 0x6f, 0x2d, 0xfb, 0x82, 0x5b, 0x48, 0x6f, 0x49, 0xb2, 0xf9, 0x07, 0xc2, 0xe8, 0x99, 0xdf,
+	0x79, 0x51, 0x30, 0xba, 0x0e, 0xc5, 0x21, 0xff, 0x8e, 0xe0, 0x27, 0x04, 0x0f, 0xfd, 0x92, 0x74,
+	0xaf, 0xdf, 0x91, 0xf4, 0x59, 0xa4, 0xe3, 0x2f, 0x73, 0x0b, 0x21, 0xd3, 0x2d, 0x20, 0xc8, 0x32,
+	0xa1, 0x30, 0xb2, 0xa1, 0xf8, 0x31, 0x41, 0xb1, 0xc9, 0xfb, 0xfc, 0xc5, 0x80, 0x22, 0x32, 0x4d,
+	0xd7, 0xe8, 0x43, 0x98, 0xf6, 0xae, 0x01, 0x2f, 0x4d, 0x04, 0x1d, 0x3a, 0xdd, 0xff, 0xc6, 0xae,
+	0x57, 0xa1, 0x14, 0x3a, 0xdd, 0xb8, 0x51, 0x73, 0xa1, 0xd3, 0x3d, 0xa7, 0x45, 0x4d, 0x78, 0x39,
+	0xa1, 0xc8, 0x87, 0x30, 0xe7, 0xcf, 0x64, 0x0e, 0x66, 0xc9, 0x47, 0x68, 0x0e, 0xbb, 0x0b, 0xcb,
+	0xa1, 0x23, 0xba, 0x3c, 0xb4, 0x05, 0x3f, 0x71, 0x03, 0xd7, 0x1b, 0x52, 0xd0, 0x2e, 0x21, 0xd9,
+	0x22, 0x2a, 0xab, 0xc2, 0xdc, 0x80, 0x07, 0x81, 0xd3, 0xe5, 0x14, 0xbd, 0xd1, 0x4f, 0xf3, 0xbb,
+	0x88, 0x48, 0xcc, 0x16, 0x42, 0x64, 0x15, 0xf2, 0xa1, 0xd3, 0x25, 0x2b, 0x16, 0xa2, 0xcd, 0x25,
+	0x87, 0xa4, 0xcb, 0x74, 0xe0, 0xcf, 0xdd, 0x20, 0x0c, 0x94, 0xd6, 0x25, 0x8b, 0x7e, 0x65, 0x03,
+	0x99, 0xcf, 0x06, 0xf2, 0x2f, 0x06, 0x5c, 0x97, 0x9b, 0xef, 0x70, 0xd1, 0xbd, 0x84, 0x88, 0x8f,
+	0xf0, 0xca, 0x4d, 0xc5, 0xeb, 0x06, 0xcc, 0xb7, 0xbd, 0xc1, 0xc0, 0x0d, 0x6d, 0xb7, 0x43, 0x4a,
+	0x95, 0x90, 0xf0, 0xb4, 0x23, 0x2d, 0xa2, 0xfa, 0x46, 0x89, 0x4f, 0xf5, 0x6c, 0x2a, 0x76, 0xec,
+	0x25, 0x98, 0x75, 0x7c, 0xbf, 0x7f, 0x5a, 0x2d, 0x2a, 0x08, 0xf0, 0x87, 0xf9, 0x2b, 0x4a, 0x64,
+	0xcd, 0x2a, 0x02, 0x55, 0x53, 0xc0, 0x48, 0x28, 0xb0, 0x01, 0x8b, 0x94, 0xb1, 0x23, 0x55, 0x4c,
+	0xc8, 0xf1, 0xab, 0x91, 0x21, 0x7b, 0x51, 0xdf, 0x41, 0xa1, 0x58, 0x71, 0xac, 0xf2, 0x51, 0xec,
+	0x57, 0x36, 0xfc, 0x85, 0x4c, 0xf8, 0xdf, 0x2c, 0x94, 0x72, 0x95, 0xbc, 0xf9, 0x6e, 0x0e, 0x23,
+	0x40, 0xa9, 0x7b, 0xe8, 0x59, 0xfc, 0xf8, 0x6a, 0x7d, 0xb0, 0x0a, 0x10, 0x78, 0x23, 0xd1, 0xe6,
+	0x76, 0xd0, 0x73, 0xc8, 0x09, 0xf3, 0x48, 0x39, 0xe8, 0x39, 0x53, 0xbd, 0xb0, 0x0a, 0x30, 0x0e,
+	0xf5, 0x63, 0x72, 0xc4, 0x7c, 0x14, 0xe5, 0xc7, 0x71, 0x27, 0x15, 0x75, 0x27, 0xd5, 0xa1, 0x72,
+	0xec, 0x8a, 0x20, 0xb4, 0x7d, 0x47, 0xf0, 0x21, 0x7e, 0x3e, 0x87, 0x49, 0xa2, 0xe8, 0xfb, 0x8a,
+	0x6c, 0xf1, 0x63, 0xd3, 0x89, 0x45, 0x23, 0x01, 0x71, 0x1e, 0xb7, 0x5d, 0xa4, 0xdf, 0x7d, 0x0f,
+	0x5e, 0xce, 0xf4, 0xe2, 0xd9, 0x3b, 0xbc, 0x06, 0x65, 0x09, 0xb1, 0xdd, 0x56, 0x49, 0xda, 0xa1,
+	0x8c, 0x5b, 0x90, 0x34, 0xcc, 0xdb, 0x0e, 0xbb, 0x03, 0x4b, 0x14, 0x3b, 0x11, 0x53, 0x5e, 0x31,
+	0x51, 0x44, 0x11, 0x9b, 0xf9, 0x33, 0x03, 0xae, 0x49, 0x1b, 0xb7, 0xb6, 0x5e, 0xd4, 0x74, 0x33,
+	0x7f, 0x48, 0xd5, 0x75, 0xa2, 0x22, 0x39, 0x21, 0x95, 0x1e, 0xc6, 0x25, 0xa5, 0xc7, 0x14, 0x5f,
+	0xfd, 0x9e, 0x12, 0xa3, 0xd9, 0xe3, 0x42, 0x9c, 0xee, 0xbb, 0xed, 0x6f, 0x5f, 0x2d, 0x5a, 0xf7,
+	0xa0, 0x88, 0xe0, 0x50, 0xde, 0xaf, 0x44, 0x3c, 0x5f, 0x76, 0xc3, 0xa6, 0x5a, 0xb0, 0x88, 0x21,
+	0xd9, 0xdb, 0x0b, 0xa9, 0xde, 0x3e, 0xbd, 0x66, 0xdd, 0x87, 0x15, 0x1c, 0x01, 0xe3, 0x02, 0x30,
+	0x65, 0x96, 0xd5, 0xc2, 0xc6, 0x44, 0xca, 0x1b, 0x50, 0x41, 0xde, 0x98, 0xb5, 0x73, 0x53, 0xad,
+	0xc5, 0xcf, 0x27, 0x04, 0xf3, 0x9f, 0x39, 0x4c, 0xa8, 0x38, 0x80, 0x97, 0xeb, 0x4b, 0x8c, 0x75,
+	0x3b, 0x14, 0x3c, 0xe1, 0x4b, 0x5c, 0x38, 0x14, 0x1c, 0x7d, 0x29, 0x33, 0x88, 0x22, 0x31, 0xde,
+	0x90, 0x16, 0x90, 0x86, 0x2c, 0x17, 0xa8, 0x9c, 0xac, 0x0d, 0xd7, 0x53, 0x5b, 0xdb, 0x6d, 0xaf,
+	0x83, 0x68, 0x2f, 0x3d, 0x6e, 0xc4, 0xdd, 0x9b, 0x36, 0xbf, 0xd1, 0xd4, 0xd5, 0xb3, 0xae, 0x25,
+	0xf4, 0x6d, 0x7a, 0x1d, 0x6e, 0xbe, 0x0e, 0xcb, 0x09, 0x3e, 0x56, 0x82, 0xc2, 0xee, 0xde, 0x6e,
+	0xab, 0x32, 0xc3, 0xe6, 0x61, 0xb6, 0xb5, 0xb3, 0x7f, 0xf8, 0xf5, 0x8a, 0xc1, 0xca, 0x50, 0x6a,
+	0xee, 0xed, 0x6e, 0xbd, 0xf5, 0xb4, 0x79, 0x58, 0xc9, 0x99, 0xbf, 0xcb, 0xc1, 0x8a, 0x0a, 0x2a,
+	0x7e, 0xc2, 0xa5, 0x37, 0x3e, 0x8e, 0xd8, 0x0b, 0x44, 0xec, 0xdf, 0x72, 0xc0, 0xe2, 0xe0, 0xfd,
+	0x7f, 0x44, 0xab, 0xfd, 0x01, 0xd1, 0x7a, 0x5f, 0x73, 0xad, 0x66, 0xfa, 0x55, 0x46, 0xea, 0xbf,
+	0x73, 0x70, 0x43, 0xe5, 0x87, 0x32, 0x6b, 0xcb, 0xed, 0xf3, 0xe0, 0x49, 0x5b, 0xa2, 0xb8, 0xcd,
+	0x9d, 0x0e, 0x17, 0x6c, 0x0b, 0x8a, 0x8e, 0xfa, 0xad, 0xe0, 0x4e, 0x26, 0x55, 0xf6, 0x47, 0x0d,
+	0xfc, 0x71, 0x78, 0xea, 0x73, 0x8b, 0xbe, 0x96, 0x5d, 0xe8, 0xd8, 0xed, 0x73, 0xdb, 0x77, 0xc2,
+	0x1e, 0x8d, 0xd8, 0x25, 0x49, 0xd8, 0x77, 0xc2, 0x1e, 0x5b, 0x87, 0x45, 0x5f, 0xce, 0xce, 0xde,
+	0x28, 0x40, 0x86, 0xbc, 0x62, 0x28, 0x47, 0x44, 0xc5, 0x24, 0x9b, 0xab, 0x13, 0xf0, 0xcf, 0xbd,
+	0x6e, 0xb7, 0xbd, 0x61, 0xc8, 0xe9, 0xe4, 0x2c, 0x9b, 0xab, 0xa2, 0x36, 0x91, 0xc8, 0xee, 0x41,
+	0x85, 0x3f, 0xe7, 0xed, 0x51, 0xc8, 0x6d, 0x29, 0x7f, 0x10, 0x21, 0x5c, 0xb2, 0x96, 0x89, 0xbe,
+	0x45, 0x64, 0xb9, 0xad, 0x3b, 0x3c, 0xe6, 0x62, 0x2c, 0x10, 0x27, 0xc8, 0xb2, 0x22, 0x92, 0x3c,
+	0xf3, 0x19, 0xc0, 0xc4, 0x1c, 0x06, 0x50, 0x6c, 0x5a, 0xad, 0x27, 0x87, 0x12, 0xd3, 0x25, 0x00,
+	0xfc, 0xdb, 0xde, 0x7c, 0x6a, 0x55, 0x0c, 0xb9, 0xf6, 0x6c, 0x7f, 0x53, 0xae, 0xe5, 0x24, 0xf2,
+	0x3b, 0x7b, 0x5f, 0x6d, 0x55, 0xf2, 0x92, 0xba, 0xd9, 0x7a, 0xab, 0x75, 0xd8, 0xaa, 0x14, 0xa4,
+	0x17, 0x9a, 0xdb, 0x3b, 0x7b, 0x9b, 0x95, 0x59, 0xf3, 0x27, 0x06, 0xf5, 0xb5, 0x24, 0x84, 0xec,
+	0x0d, 0x28, 0xf6, 0x14, 0x8c, 0x14, 0xe0, 0xeb, 0xe7, 0x40, 0x7c, 0x7b, 0xc6, 0xa2, 0x8f, 0x58,
+	0x0d, 0xe6, 0x22, 0x73, 0x14, 0xcc, 0xdb, 0x33, 0x56, 0x44, 0xd8, 0x30, 0x61, 0x4d, 0x96, 0x0c,
+	0x9b, 0xe2, 0x5a, 0xe2, 0x13, 0xd8, 0xe8, 0x20, 0xdb, 0x77, 0x4e, 0xfb, 0x9e, 0xd3, 0x31, 0x7f,
+	0x9b, 0x87, 0x9b, 0x89, 0x9d, 0xa8, 0x7e, 0x51, 0x44, 0x5c, 0x4d, 0x15, 0x4b, 0x94, 0xa6, 0x7c,
+	0xaa, 0x34, 0xdd, 0x81, 0x25, 0x52, 0x3b, 0xaa, 0x50, 0x58, 0xbe, 0x16, 0x91, 0xba, 0x43, 0x75,
+	0xea, 0xd3, 0xc0, 0x88, 0xcd, 0x19, 0x85, 0x3d, 0x4f, 0xa0, 0x38, 0x2c, 0x66, 0x15, 0x5c, 0x79,
+	0xa2, 0x16, 0x94, 0xd0, 0x06, 0x5c, 0xd3, 0xb9, 0xf9, 0xc0, 0x71, 0xfb, 0x54, 0xd7, 0x56, 0xe2,
+	0xec, 0x2d, 0xb9, 0x90, 0x5d, 0x05, 0xe7, 0xce, 0x5f, 0x05, 0x4b, 0xe7, 0xae, 0x82, 0xf2, 0x58,
+	0x73, 0xec, 0x89, 0x36, 0xaf, 0xce, 0xe3, 0xb1, 0x46, 0xfd, 0x90, 0x69, 0x84, 0x42, 0xe5, 0xd8,
+	0x0e, 0x38, 0xcc, 0x29, 0xc2, 0x41, 0xcf, 0x31, 0x7f, 0x43, 0x27, 0xb9, 0xb4, 0xeb, 0xd8, 0x17,
+	0x13, 0x41, 0x75, 0x7b, 0x4a, 0x50, 0x69, 0xae, 0x8e, 0x45, 0xd5, 0xe7, 0xc7, 0x65, 0x20, 0xa7,
+	0x57, 0xdd, 0xec, 0xa0, 0x9c, 0x89, 0xf2, 0x7e, 0x63, 0x1d, 0x5e, 0x4b, 0x87, 0x9c, 0xc0, 0x5d,
+	0xc6, 0x31, 0xf7, 0xcb, 0xe8, 0x92, 0x2e, 0xae, 0xc8, 0x25, 0x96, 0xfd, 0x5b, 0xb0, 0xe0, 0x0e,
+	0x3b, 0xfc, 0xb9, 0x56, 0xf0, 0x41, 0x91, 0xce, 0x28, 0xe4, 0x53, 0xce, 0xcb, 0xbf, 0x18, 0xf7,
+	0x76, 0x59, 0x78, 0xae, 0x7c, 0x76, 0x17, 0x6a, 0x9b, 0xd8, 0xec, 0x8e, 0x84, 0x33, 0x8e, 0xca,
+	0xab, 0x40, 0x79, 0xa3, 0x82, 0x64, 0x16, 0xcf, 0x76, 0x48, 0x91, 0x67, 0xbb, 0x2f, 0xc1, 0x8a,
+	0xe0, 0x03, 0x2f, 0xe4, 0xf1, 0xc0, 0x2c, 0x4e, 0x55, 0xb8, 0x82, 0xcc, 0xb1, 0xc8, 0x5c, 0x87,
+	0x45, 0x12, 0x40, 0xdb, 0x63, 0x02, 0x94, 0x91, 0x88, 0x6e, 0xf8, 0x42, 0xae, 0x6a, 0x98, 0xdf,
+	0x37, 0xa2, 0x46, 0x8e, 0x48, 0x8d, 0xef, 0x34, 0x80, 0x8c, 0x92, 0xfa, 0xe1, 0x31, 0x8b, 0xcc,
+	0x94, 0xfa, 0x5d, 0xe0, 0x74, 0x20, 0xf1, 0xe9, 0x26, 0x1a, 0x74, 0xa9, 0x4b, 0xdd, 0x59, 0xa9,
+	0xf0, 0x77, 0xaa, 0x66, 0xa8, 0x42, 0xd3, 0x1b, 0x1e, 0xbb, 0x62, 0xe0, 0x1c, 0xf5, 0xc7, 0x7e,
+	0x6b, 0x25, 0x12, 0xe3, 0x53, 0x7a, 0x1b, 0xce, 0xfe, 0xaa, 0x91, 0xca, 0x8f, 0xeb, 0xd1, 0x25,
+	0x84, 0x3a, 0x15, 0x6e, 0xcf, 0xd0, 0x35, 0x44, 0xed, 0x8f, 0x39, 0x28, 0x5e, 0x69, 0xdd, 0xfc,
+	0x9f, 0x8d, 0x10, 0x56, 0x87, 0x8a, 0xf4, 0x9d, 0x3f, 0x0a, 0x7a, 0xb6, 0xe7, 0xab, 0x9b, 0xfc,
+	0x6a, 0x69, 0x2d, 0x5f, 0x9f, 0xb7, 0x96, 0xba, 0x6e, 0xb8, 0x3f, 0x0a, 0x7a, 0x7b, 0x48, 0xdd,
+	0xb8, 0x07, 0x77, 0x55, 0x0d, 0x21, 0x43, 0xdb, 0x13, 0x7f, 0xa4, 0x2a, 0xc9, 0x5f, 0x0d, 0x58,
+	0x9d, 0xe2, 0x39, 0x8a, 0xbe, 0x5b, 0xe9, 0xe8, 0xdb, 0x9e, 0x89, 0xc7, 0xdf, 0x5d, 0x58, 0x22,
+	0x06, 0xe9, 0x42, 0x37, 0x3a, 0xe9, 0x6f, 0xcf, 0x58, 0x8b, 0x48, 0x7f, 0x82, 0xe4, 0x8b, 0x14,
+	0x0d, 0x3d, 0x50, 0x0b, 0x7a, 0xa0, 0x6e, 0xdc, 0x87, 0xfa, 0x74, 0xfb, 0x50, 0xed, 0xb1, 0x81,
+	0x3f, 0xa7, 0xea, 0x73, 0xf0, 0xce, 0xc8, 0x09, 0xae, 0xfe, 0xe6, 0x20, 0x50, 0xdb, 0xc4, 0x62,
+	0x0b, 0x09, 0x67, 0xc4, 0x96, 0xd6, 0xa1, 0x66, 0xf5, 0x0e, 0xc5, 0x5e, 0x81, 0x39, 0x3e, 0xec,
+	0xa8, 0xa5, 0xa2, 0x5a, 0x2a, 0xf2, 0x61, 0x47, 0x2e, 0xdc, 0x86, 0x22, 0x76, 0x60, 0x3a, 0x28,
+	0xe8, 0xea, 0xd0, 0x5a, 0xc6, 0x0c, 0x50, 0xca, 0x98, 0x01, 0x4c, 0x17, 0xcb, 0x4e, 0x04, 0xd1,
+	0xa4, 0xec, 0x90, 0x35, 0xb1, 0xb2, 0x83, 0x14, 0xa9, 0xc1, 0x59, 0xa5, 0x04, 0x2f, 0xe9, 0xac,
+	0xb4, 0xbb, 0xcd, 0x9f, 0xd2, 0xf5, 0x84, 0x8c, 0x89, 0xd3, 0x7d, 0x27, 0x9c, 0x5c, 0xe6, 0x9c,
+	0xd9, 0x71, 0x53, 0xec, 0x8d, 0xac, 0x39, 0xce, 0x97, 0x0c, 0x3c, 0x98, 0xcc, 0x71, 0x44, 0xa8,
+	0xfd, 0xc0, 0xb8, 0xe2, 0xaa, 0xb2, 0x0e, 0x8b, 0x74, 0xcf, 0x47, 0x3e, 0xa6, 0x81, 0x1c, 0x89,
+	0x98, 0xc0, 0xe3, 0x69, 0x52, 0x55, 0x3a, 0x5b, 0xe9, 0x96, 0xca, 0xc7, 0x6f, 0xe0, 0x44, 0x12,
+	0xb7, 0xf7, 0xf2, 0xfa, 0xba, 0xf9, 0x0f, 0x03, 0x6a, 0x93, 0x67, 0x9f, 0x83, 0xd1, 0xd1, 0xc0,
+	0xeb, 0x8c, 0xfa, 0xfc, 0xca, 0xaf, 0x4e, 0x29, 0x08, 0x63, 0x57, 0xa7, 0x48, 0x39, 0xeb, 0xea,
+	0xf4, 0x26, 0xcc, 0x07, 0x91, 0x82, 0xd1, 0xcd, 0xe9, 0x98, 0x90, 0x11, 0xd9, 0xc5, 0xac, 0xc8,
+	0xfe, 0x93, 0x81, 0xa7, 0xb5, 0x94, 0xc1, 0x1f, 0xcd, 0xed, 0x5c, 0xea, 0x8c, 0x5c, 0x48, 0x9d,
+	0x91, 0xdf, 0x2c, 0x94, 0xf2, 0x95, 0x82, 0x95, 0x3e, 0x76, 0x3f, 0xfe, 0xd7, 0x02, 0x54, 0xc6,
+	0xfa, 0x1c, 0x70, 0x71, 0xe2, 0xb6, 0x39, 0xfb, 0x16, 0x54, 0x92, 0x4f, 0x9f, 0xec, 0x96, 0x36,
+	0x6b, 0xa6, 0xdf, 0x71, 0x6b, 0x6b, 0xd3, 0x19, 0x10, 0x17, 0x73, 0xfe, 0xfd, 0xf7, 0xea, 0xb3,
+	0x25, 0xa3, 0x66, 0x3c, 0x8a, 0x76, 0x88, 0xbf, 0x14, 0xea, 0x3b, 0x64, 0xbc, 0x82, 0xea, 0x3b,
+	0x64, 0x3d, 0x32, 0x66, 0xec, 0x10, 0x7f, 0xb0, 0xd3, 0x77, 0xc8, 0x78, 0x5c, 0xd4, 0x77, 0xc8,
+	0x7a, 0xeb, 0x8b, 0xef, 0xf0, 0x35, 0x58, 0xd4, 0x9e, 0x8b, 0xd8, 0xcd, 0x34, 0x02, 0x93, 0x17,
+	0xb1, 0xda, 0xea, 0x94, 0xd5, 0xa9, 0x82, 0xc7, 0x2f, 0x73, 0xba, 0xe0, 0xe4, 0xcb, 0xa1, 0x2e,
+	0x38, 0xf5, 0x9c, 0x17, 0x17, 0xfc, 0x36, 0x2c, 0xe9, 0xb7, 0xfa, 0x4c, 0xfb, 0x36, 0xf5, 0xec,
+	0x51, 0xfb, 0xc4, 0xb4, 0xe5, 0xb4, 0x6c, 0x07, 0x96, 0x13, 0x2f, 0x3d, 0x2c, 0xfd, 0xb5, 0x8e,
+	0xf6, 0xad, 0xa9, 0xeb, 0x29, 0xf1, 0x75, 0xe3, 0xa1, 0xc1, 0x0e, 0xa1, 0x1c, 0xbf, 0x0d, 0x67,
+	0x37, 0xe2, 0xdf, 0x27, 0xae, 0xf1, 0x6b, 0x37, 0xb3, 0x17, 0xa7, 0x82, 0x32, 0xb9, 0x9a, 0xd4,
+	0x41, 0x49, 0x5d, 0x79, 0xeb, 0xa0, 0xa4, 0x6f, 0x34, 0x33, 0x40, 0x89, 0x9d, 0xa8, 0x74, 0x50,
+	0xd2, 0x67, 0x3e, 0x1d, 0x94, 0x8c, 0xa3, 0x98, 0xb9, 0xf0, 0xfe, 0x7b, 0xf5, 0xb9, 0x92, 0x51,
+	0xcb, 0x3f, 0x6a, 0x3c, 0xaa, 0x1b, 0xec, 0x2b, 0x00, 0x93, 0x51, 0x8b, 0xbd, 0x9a, 0x1e, 0x9c,
+	0x23, 0xc1, 0xb5, 0xac, 0x25, 0x92, 0x59, 0x1e, 0xab, 0xfc, 0xa3, 0x9c, 0xc1, 0x46, 0xd8, 0x4d,
+	0x53, 0xd3, 0x1b, 0xbb, 0x7d, 0x9e, 0xb1, 0xbc, 0x76, 0xe7, 0x03, 0xb8, 0x32, 0xed, 0x78, 0x68,
+	0xb0, 0xdd, 0xc8, 0x92, 0x13, 0x2e, 0xc2, 0xa4, 0x25, 0xb1, 0x1b, 0xdc, 0xa4, 0x25, 0xf1, 0x4b,
+	0xba, 0x38, 0xf8, 0x24, 0x0f, 0x07, 0x10, 0x5d, 0x9e, 0x36, 0xb7, 0xe9, 0xf2, 0xf4, 0x79, 0x25,
+	0x2e, 0xef, 0x9b, 0x18, 0x28, 0x93, 0x2e, 0xaa, 0x07, 0x4a, 0x6a, 0x9a, 0xd0, 0x03, 0x25, 0xdd,
+	0x7c, 0x93, 0x9e, 0x74, 0xf1, 0x3d, 0x2a, 0xd1, 0x55, 0x98, 0x99, 0xae, 0x7a, 0xc9, 0x1e, 0x5b,
+	0x5b, 0x3f, 0x93, 0x27, 0x65, 0xca, 0xc6, 0xc3, 0xb7, 0xe5, 0x07, 0x7d, 0xe7, 0xa8, 0xd1, 0xf6,
+	0x06, 0x0f, 0xf0, 0xcf, 0xcf, 0x78, 0xa2, 0xfb, 0x00, 0xc5, 0x3c, 0x50, 0xff, 0xb5, 0xf3, 0xa0,
+	0xeb, 0xd1, 0x6f, 0xff, 0xe8, 0xa8, 0xa8, 0x48, 0x9f, 0xfd, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff,
+	0x4a, 0xa4, 0xe2, 0x74, 0xf2, 0x23, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/proto/operations.proto b/proto/operations.proto
index 7504efe4b..b2d2d24e5 100644
--- a/proto/operations.proto
+++ b/proto/operations.proto
@@ -366,6 +366,7 @@ message UserRebaseConfirmableRequest {
     string branch_sha = 5;
     Repository remote_repository = 6;
     bytes remote_branch = 7;
+    repeated string git_push_options = 8;
   }
 
   oneof user_rebase_confirmable_request_payload {
diff --git a/ruby/lib/gitaly_server/operations_service.rb b/ruby/lib/gitaly_server/operations_service.rb
index 3079dda49..0d3cb43cd 100644
--- a/ruby/lib/gitaly_server/operations_service.rb
+++ b/ruby/lib/gitaly_server/operations_service.rb
@@ -222,7 +222,8 @@ module GitalyServer
             branch: header.branch,
             branch_sha: header.branch_sha,
             remote_repository: remote_repository,
-            remote_branch: header.remote_branch
+            remote_branch: header.remote_branch,
+            push_options: Gitlab::Git::PushOptions.new(header.git_push_options)
           ) do |rebase_sha|
             y << Gitaly::UserRebaseConfirmableResponse.new(rebase_sha: rebase_sha)
 
diff --git a/ruby/lib/gitlab/git/hook.rb b/ruby/lib/gitlab/git/hook.rb
index 61af0999a..7a5e15871 100644
--- a/ruby/lib/gitlab/git/hook.rb
+++ b/ruby/lib/gitlab/git/hook.rb
@@ -28,13 +28,13 @@ module Gitlab
         File.exist?(path)
       end
 
-      def trigger(gl_id, gl_username, oldrev, newrev, ref)
+      def trigger(gl_id, gl_username, oldrev, newrev, ref, push_options: nil)
         return [true, nil] unless exists?
 
         Bundler.with_clean_env do
           case name
           when "pre-receive", "post-receive"
-            call_receive_hook(gl_id, gl_username, oldrev, newrev, ref)
+            call_receive_hook(gl_id, gl_username, oldrev, newrev, ref, push_options)
           when "update"
             call_update_hook(gl_id, gl_username, oldrev, newrev, ref)
           end
@@ -43,13 +43,14 @@ module Gitlab
 
       private
 
-      def call_receive_hook(gl_id, gl_username, oldrev, newrev, ref)
+      def call_receive_hook(gl_id, gl_username, oldrev, newrev, ref, push_options)
         changes = [oldrev, newrev, ref].join(" ")
 
         exit_status = false
         exit_message = nil
 
         vars = env_base_vars(gl_id, gl_username)
+        vars.merge!(push_options.env_data) if push_options
 
         options = {
           chdir: repo_path
diff --git a/ruby/lib/gitlab/git/hooks_service.rb b/ruby/lib/gitlab/git/hooks_service.rb
index d6a08a79c..30501d388 100644
--- a/ruby/lib/gitlab/git/hooks_service.rb
+++ b/ruby/lib/gitlab/git/hooks_service.rb
@@ -3,22 +3,25 @@ module Gitlab
     class HooksService
       attr_accessor :oldrev, :newrev, :ref
 
-      def execute(pusher, repository, oldrev, newrev, ref)
+      def execute(pusher, repository, oldrev, newrev, ref, push_options:)
         @repository  = repository
         @gl_id       = pusher.gl_id
         @gl_username = pusher.username
         @oldrev      = oldrev
         @newrev      = newrev
         @ref         = ref
+        @push_options = push_options
 
-        %w(pre-receive update).each do |hook_name|
+        %w[pre-receive update].each do |hook_name|
           status, message = run_hook(hook_name)
 
           raise PreReceiveError, message unless status
         end
 
         yield(self).tap do
-          run_hook('post-receive')
+          status, message = run_hook('post-receive')
+
+          Gitlab::GitLogger.error("post-receive hook: #{message}") unless status
         end
       end
 
@@ -26,7 +29,7 @@ module Gitlab
 
       def run_hook(name)
         hook = Gitlab::Git::Hook.new(name, @repository)
-        hook.trigger(@gl_id, @gl_username, oldrev, newrev, ref)
+        hook.trigger(@gl_id, @gl_username, oldrev, newrev, ref, push_options: @push_options)
       end
     end
   end
diff --git a/ruby/lib/gitlab/git/operation_service.rb b/ruby/lib/gitlab/git/operation_service.rb
index 1235a1c01..8c62a13b7 100644
--- a/ruby/lib/gitlab/git/operation_service.rb
+++ b/ruby/lib/gitlab/git/operation_service.rb
@@ -96,9 +96,9 @@ module Gitlab
         end
       end
 
-      def update_branch(branch_name, newrev, oldrev)
+      def update_branch(branch_name, newrev, oldrev, push_options: nil)
         ref = Gitlab::Git::BRANCH_REF_PREFIX + branch_name
-        update_ref_in_hooks(ref, newrev, oldrev)
+        update_ref_in_hooks(ref, newrev, oldrev, push_options: push_options)
       end
 
       # Yields the given block (which should return a commit) and
@@ -172,21 +172,21 @@ module Gitlab
         end
       end
 
-      def update_ref_in_hooks(ref, newrev, oldrev)
-        with_hooks(ref, newrev, oldrev) do
+      def update_ref_in_hooks(ref, newrev, oldrev, push_options: nil)
+        with_hooks(ref, newrev, oldrev, push_options: push_options) do
           update_ref(ref, newrev, oldrev)
         end
       end
 
-      def with_hooks(ref, newrev, oldrev)
+      def with_hooks(ref, newrev, oldrev, push_options: nil)
         Gitlab::Git::HooksService.new.execute(
           user,
           repository,
           oldrev,
           newrev,
-          ref
+          ref,
+          push_options: push_options
         ) do |service|
-
           yield(service)
         end
       end
diff --git a/ruby/lib/gitlab/git/push_options.rb b/ruby/lib/gitlab/git/push_options.rb
new file mode 100644
index 000000000..f758529f7
--- /dev/null
+++ b/ruby/lib/gitlab/git/push_options.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module Git
+    class PushOptions
+      attr_accessor :options
+
+      def initialize(options = [])
+        @options = options
+      end
+
+      def env_data
+        return {} if options.empty?
+
+        data = {
+          'GIT_PUSH_OPTION_COUNT' => options.count.to_s
+        }
+
+        options.each_with_index do |opt, index|
+          data["GIT_PUSH_OPTION_#{index}"] = opt
+        end
+
+        data
+      end
+    end
+  end
+end
diff --git a/ruby/lib/gitlab/git/repository.rb b/ruby/lib/gitlab/git/repository.rb
index c3d3ab3a2..2566ce4df 100644
--- a/ruby/lib/gitlab/git/repository.rb
+++ b/ruby/lib/gitlab/git/repository.rb
@@ -242,8 +242,8 @@ module Gitlab
         raise TagExistsError
       end
 
-      def update_branch(branch_name, user:, newrev:, oldrev:)
-        OperationService.new(user, self).update_branch(branch_name, newrev, oldrev)
+      def update_branch(branch_name, user:, newrev:, oldrev:, push_options: nil)
+        OperationService.new(user, self).update_branch(branch_name, newrev, oldrev, push_options: push_options)
       end
 
       def rm_branch(branch_name, user:)
@@ -347,7 +347,7 @@ module Gitlab
         rugged.diff(sha1, sha2).size.positive?
       end
 
-      def rebase(user, rebase_id, branch:, branch_sha:, remote_repository:, remote_branch:)
+      def rebase(user, rebase_id, branch:, branch_sha:, remote_repository:, remote_branch:, push_options: nil)
         worktree = Gitlab::Git::Worktree.new(path, REBASE_WORKTREE_PREFIX, rebase_id)
         env = git_env.merge(user.git_env)
 
@@ -377,7 +377,7 @@ module Gitlab
 
           yield rebase_sha if block_given?
 
-          update_branch(branch, user: user, newrev: rebase_sha, oldrev: branch_sha)
+          update_branch(branch, user: user, newrev: rebase_sha, oldrev: branch_sha, push_options: push_options)
 
           rebase_sha
         end
diff --git a/ruby/proto/gitaly/operations_pb.rb b/ruby/proto/gitaly/operations_pb.rb
index 7383511f5..537adf5ad 100644
--- a/ruby/proto/gitaly/operations_pb.rb
+++ b/ruby/proto/gitaly/operations_pb.rb
@@ -209,6 +209,7 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
     optional :branch_sha, :string, 5
     optional :remote_repository, :message, 6, "gitaly.Repository"
     optional :remote_branch, :bytes, 7
+    repeated :git_push_options, :string, 8
   end
   add_message "gitaly.UserRebaseConfirmableResponse" do
     optional :pre_receive_error, :string, 3
diff --git a/ruby/spec/lib/gitlab/git/hook_spec.rb b/ruby/spec/lib/gitlab/git/hook_spec.rb
index dd0fab005..6ebb1e9bf 100644
--- a/ruby/spec/lib/gitlab/git/hook_spec.rb
+++ b/ruby/spec/lib/gitlab/git/hook_spec.rb
@@ -13,6 +13,13 @@ describe Gitlab::Git::Hook do
     let(:tmp_dir) { Dir.mktmpdir }
     let(:hook_names) { %w[pre-receive post-receive update] }
     let(:repo) { gitlab_git_from_gitaly(test_repo_read_only) }
+    let(:push_options) do
+      Gitlab::Git::PushOptions.new(['ci.skip'])
+    end
+
+    def trigger_with_stub_data(hook, push_options)
+      hook.trigger('user-1', 'admin', '0' * 40, 'a' * 40, 'master', push_options: push_options)
+    end
 
     before do
       hook_names.each do |f|
@@ -60,7 +67,7 @@ describe Gitlab::Git::Hook do
       it 'returns true' do
         hook_names.each do |hook|
           trigger_result = described_class.new(hook, repo)
-                                          .trigger(vars['GL_ID'], vars['GL_USERNAME'], '0' * 40, 'a' * 40, 'master')
+                                          .trigger(vars['GL_ID'], vars['GL_USERNAME'], '0' * 40, 'a' * 40, 'master', push_options: push_options)
 
           expect(trigger_result.first).to be(true), "#{hook} failed:  #{trigger_result.last}"
         end
@@ -73,7 +80,7 @@ describe Gitlab::Git::Hook do
       it 'returns true' do
         hook_names.each do |hook|
           trigger_result = described_class.new(hook, repo)
-                                          .trigger('user-456', 'admin', '0' * 40, 'a' * 40, 'master')
+                                          .trigger('user-456', 'admin', '0' * 40, 'a' * 40, 'master', push_options: push_options)
 
           expect(trigger_result.first).to be(true)
         end
@@ -84,9 +91,44 @@ describe Gitlab::Git::Hook do
       let(:script) { "#!/bin/sh\nexit 1\n" }
 
       it 'returns false' do
-        hook_names.each do |hook|
-          trigger_result = described_class.new(hook, repo)
-                                          .trigger('user-1', 'admin', '0' * 40, 'a' * 40, 'master')
+        hook_names.each do |name|
+          hook = described_class.new(name, repo)
+          trigger_result = trigger_with_stub_data(hook, push_options)
+
+          expect(trigger_result.first).to be(false)
+        end
+      end
+    end
+
+    context 'when push options are passed' do
+      let(:script) do
+        <<~HOOK
+          #!/usr/bin/env ruby
+          unless ENV['GIT_PUSH_OPTION_COUNT'] == '1' && ENV['GIT_PUSH_OPTION_0'] == 'ci.skip'
+            abort 'missing GIT_PUSH_OPTION env vars'
+          end
+        HOOK
+      end
+
+      context 'for pre-receive and post-receive hooks' do
+        let(:hooks) do
+          %w[pre-receive post-receive].map { |name| described_class.new(name, repo) }
+        end
+
+        it 'sets the push options environment variables' do
+          hooks.each do |hook|
+            trigger_result = trigger_with_stub_data(hook, push_options)
+
+            expect(trigger_result.first).to be(true)
+          end
+        end
+      end
+
+      context 'for update hook' do
+        let(:hook) { described_class.new('update', repo) }
+
+        it 'does not set the push options environment variables' do
+          trigger_result = trigger_with_stub_data(hook, push_options)
 
           expect(trigger_result.first).to be(false)
         end
diff --git a/ruby/spec/lib/gitlab/git/push_options_spec.rb b/ruby/spec/lib/gitlab/git/push_options_spec.rb
new file mode 100644
index 000000000..d2c74f399
--- /dev/null
+++ b/ruby/spec/lib/gitlab/git/push_options_spec.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Gitlab::Git::PushOptions do
+  subject { described_class.new(options) }
+
+  describe '#env_data' do
+    context 'when push options are set' do
+      let(:options) { ['ci.skip', 'test=value'] }
+
+      it 'sets GIT_PUSH_OPTION environment variables' do
+        env_data = subject.env_data
+
+        expect(env_data.count).to eq(3)
+        expect(env_data['GIT_PUSH_OPTION_COUNT']).to eq('2')
+        expect(env_data['GIT_PUSH_OPTION_0']).to eq('ci.skip')
+        expect(env_data['GIT_PUSH_OPTION_1']).to eq('test=value')
+      end
+    end
+
+    context 'when push options are not set' do
+      let(:options) { [] }
+
+      it 'does not set any variable' do
+        env_data = subject.env_data
+
+        expect(env_data).to eq({})
+      end
+    end
+  end
+end