Merge branch 'zj-cleanup-ref-service' into 'master'

Remove Ruby RefService

Closes #1585

See merge request gitlab-org/gitaly!1808

17 files changed, 118 insertions, 553 deletions

diff --git a/internal/praefect/protoregistry/protoregistry_test.go b/internal/praefect/protoregistry/protoregistry_test.go
index 8e4d32e3c..e99af93ba 100644
--- a/internal/praefect/protoregistry/protoregistry_test.go
+++ b/internal/praefect/protoregistry/protoregistry_test.go
@@ -97,8 +97,6 @@ func TestPopulatesProtoRegistry(t *testing.T) {
 			"FindAllTags":                     protoregistry.OpAccessor,
 			"FindAllRemoteBranches":           protoregistry.OpAccessor,
 			"RefExists":                       protoregistry.OpAccessor,
-			"CreateBranch":                    protoregistry.OpMutator,
-			"DeleteBranch":                    protoregistry.OpMutator,
 			"FindBranch":                      protoregistry.OpAccessor,
 			"DeleteRefs":                      protoregistry.OpMutator,
 			"ListBranchNamesContainingCommit": protoregistry.OpAccessor,
diff --git a/internal/service/ref/branches.go b/internal/service/ref/branches.go
index fd31ddb13..30a39cd55 100644
--- a/internal/service/ref/branches.go
+++ b/internal/service/ref/branches.go
@@ -8,40 +8,11 @@ import (
 
 	"gitlab.com/gitlab-org/gitaly/internal/git"
 	"gitlab.com/gitlab-org/gitaly/internal/git/log"
-	"gitlab.com/gitlab-org/gitaly/internal/rubyserver"
 	"gitlab.com/gitlab-org/gitaly/proto/go/gitalypb"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 )
 
-func (s *server) CreateBranch(ctx context.Context, req *gitalypb.CreateBranchRequest) (*gitalypb.CreateBranchResponse, error) {
-	client, err := s.ruby.RefServiceClient(ctx)
-	if err != nil {
-		return nil, err
-	}
-
-	clientCtx, err := rubyserver.SetHeaders(ctx, req.GetRepository())
-	if err != nil {
-		return nil, err
-	}
-
-	return client.CreateBranch(clientCtx, req)
-}
-
-func (s *server) DeleteBranch(ctx context.Context, req *gitalypb.DeleteBranchRequest) (*gitalypb.DeleteBranchResponse, error) {
-	client, err := s.ruby.RefServiceClient(ctx)
-	if err != nil {
-		return nil, err
-	}
-
-	clientCtx, err := rubyserver.SetHeaders(ctx, req.GetRepository())
-	if err != nil {
-		return nil, err
-	}
-
-	return client.DeleteBranch(clientCtx, req)
-}
-
 func (s *server) FindBranch(ctx context.Context, req *gitalypb.FindBranchRequest) (*gitalypb.FindBranchResponse, error) {
 	refName := string(req.GetName())
 	if len(refName) == 0 {
diff --git a/internal/service/ref/branches_test.go b/internal/service/ref/branches_test.go
index 7d633137a..b0f6147af 100644
--- a/internal/service/ref/branches_test.go
+++ b/internal/service/ref/branches_test.go
@@ -2,7 +2,6 @@ package ref
 
 import (
 	"context"
-	"os/exec"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -12,216 +11,6 @@ import (
 	"google.golang.org/grpc/codes"
 )
 
-func TestSuccessfulCreateBranchRequest(t *testing.T) {
-	ctx, cancel := testhelper.Context()
-	defer cancel()
-
-	server, serverSocketPath := runRefServiceServer(t)
-	defer server.Stop()
-
-	client, conn := newRefServiceClient(t, serverSocketPath)
-	defer conn.Close()
-
-	testRepo, testRepoPath, cleanupFn := testhelper.NewTestRepo(t)
-	defer cleanupFn()
-
-	headCommit, err := log.GetCommit(ctx, testRepo, "HEAD")
-	require.NoError(t, err)
-
-	startPoint := "c7fbe50c7c7419d9701eebe64b1fdacc3df5b9dd"
-	startPointCommit, err := log.GetCommit(ctx, testRepo, startPoint)
-	require.NoError(t, err)
-
-	testCases := []struct {
-		desc           string
-		startPoint     string
-		expectedBranch *gitalypb.Branch
-	}{
-		{
-			desc:       "empty start point",
-			startPoint: "",
-			expectedBranch: &gitalypb.Branch{
-				Name:         []byte("to-be-created-soon-1"),
-				TargetCommit: headCommit,
-			},
-		},
-		{
-			desc:       "present start point",
-			startPoint: startPoint,
-			expectedBranch: &gitalypb.Branch{
-				Name:         []byte("to-be-created-soon-2"),
-				TargetCommit: startPointCommit,
-			},
-		},
-	}
-
-	for _, testCase := range testCases {
-		t.Run(testCase.desc, func(t *testing.T) {
-			branchName := testCase.expectedBranch.Name
-			request := &gitalypb.CreateBranchRequest{
-				Repository: testRepo,
-				Name:       branchName,
-				StartPoint: []byte(testCase.startPoint),
-			}
-
-			ctx, cancel := context.WithCancel(context.Background())
-			defer cancel()
-
-			response, err := client.CreateBranch(ctx, request)
-			defer exec.Command("git", "-C", testRepoPath, "branch", "-D", string(branchName)).Run()
-
-			require.NoError(t, err)
-			require.Equal(t, gitalypb.CreateBranchResponse_OK, response.Status, "mismatched status")
-			require.Equal(t, testCase.expectedBranch, response.Branch, "mismatched branches")
-		})
-	}
-}
-
-func TestFailedCreateBranchRequest(t *testing.T) {
-	server, serverSocketPath := runRefServiceServer(t)
-	defer server.Stop()
-
-	client, conn := newRefServiceClient(t, serverSocketPath)
-	defer conn.Close()
-
-	testRepo, _, cleanupFn := testhelper.NewTestRepo(t)
-	defer cleanupFn()
-
-	testCases := []struct {
-		desc       string
-		branchName string
-		startPoint string
-		status     gitalypb.CreateBranchResponse_Status
-	}{
-		{
-			desc:       "branch exists",
-			branchName: "master",
-			status:     gitalypb.CreateBranchResponse_ERR_EXISTS,
-		},
-		{
-			desc:       "empty branch name",
-			branchName: "",
-			status:     gitalypb.CreateBranchResponse_ERR_INVALID,
-		},
-		{
-			desc:       "invalid start point",
-			branchName: "shiny-new-branch",
-			startPoint: "i-do-not-exist",
-			status:     gitalypb.CreateBranchResponse_ERR_INVALID_START_POINT,
-		},
-	}
-
-	for _, testCase := range testCases {
-		t.Run(testCase.desc, func(t *testing.T) {
-			request := &gitalypb.CreateBranchRequest{
-				Repository: testRepo,
-				Name:       []byte(testCase.branchName),
-				StartPoint: []byte(testCase.startPoint),
-			}
-
-			ctx, cancel := context.WithCancel(context.Background())
-			defer cancel()
-
-			response, err := client.CreateBranch(ctx, request)
-
-			require.NoError(t, err)
-			require.Equal(t, testCase.status, response.Status, "mismatched status")
-		})
-	}
-}
-
-func TestSuccessfulDeleteBranchRequest(t *testing.T) {
-	server, serverSocketPath := runRefServiceServer(t)
-	defer server.Stop()
-
-	client, conn := newRefServiceClient(t, serverSocketPath)
-	defer conn.Close()
-
-	testRepo, testRepoPath, cleanupFn := testhelper.NewTestRepo(t)
-	defer cleanupFn()
-
-	branchNameInput := "to-be-deleted-soon"
-
-	defer exec.Command("git", "-C", testRepoPath, "branch", "-D", branchNameInput).Run()
-
-	testCases := []struct {
-		desc       string
-		branchName string
-	}{
-		{
-			desc:       "regular branch name",
-			branchName: branchNameInput,
-		},
-		{
-			desc:       "absolute reference path",
-			branchName: "refs/heads/" + branchNameInput,
-		},
-	}
-
-	for _, testCase := range testCases {
-		t.Run(testCase.desc, func(t *testing.T) {
-			testhelper.MustRunCommand(t, nil, "git", "-C", testRepoPath, "branch", branchNameInput)
-
-			request := &gitalypb.DeleteBranchRequest{
-				Repository: testRepo,
-				Name:       []byte(testCase.branchName),
-			}
-
-			ctx, cancel := context.WithCancel(context.Background())
-			defer cancel()
-
-			_, err := client.DeleteBranch(ctx, request)
-			require.NoError(t, err)
-
-			branches := testhelper.MustRunCommand(t, nil, "git", "-C", testRepoPath, "branch")
-			require.NotContains(t, branches, branchNameInput, "branch name exists in branches list")
-		})
-	}
-}
-
-func TestFailedDeleteBranchRequest(t *testing.T) {
-	server, serverSocketPath := runRefServiceServer(t)
-	defer server.Stop()
-
-	client, conn := newRefServiceClient(t, serverSocketPath)
-	defer conn.Close()
-
-	testRepo, _, cleanupFn := testhelper.NewTestRepo(t)
-	defer cleanupFn()
-
-	testCases := []struct {
-		desc       string
-		branchName string
-		code       codes.Code
-	}{
-		{
-			desc:       "branch does not exist",
-			branchName: "this-branch-does-not-exist",
-			code:       codes.Internal,
-		},
-		{
-			desc:       "empty branch name",
-			branchName: "",
-			code:       codes.InvalidArgument,
-		},
-	}
-
-	for _, testCase := range testCases {
-		t.Run(testCase.desc, func(t *testing.T) {
-			request := &gitalypb.DeleteBranchRequest{
-				Repository: testRepo,
-				Name:       []byte(testCase.branchName),
-			}
-
-			ctx, cancel := context.WithCancel(context.Background())
-			defer cancel()
-
-			_, err := client.DeleteBranch(ctx, request)
-			testhelper.RequireGrpcError(t, err, testCase.code)
-		})
-	}
-}
-
 func TestSuccessfulFindBranchRequest(t *testing.T) {
 	ctx, cancel := testhelper.Context()
 	defer cancel()
diff --git a/internal/service/ref/server.go b/internal/service/ref/server.go
index cfc4e029b..311133fad 100644
--- a/internal/service/ref/server.go
+++ b/internal/service/ref/server.go
@@ -1,16 +1,14 @@
 package ref
 
 import (
-	"gitlab.com/gitlab-org/gitaly/internal/rubyserver"
 	"gitlab.com/gitlab-org/gitaly/proto/go/gitalypb"
 )
 
 type server struct {
-	ruby *rubyserver.Server
 	gitalypb.UnimplementedRefServiceServer
 }
 
 // NewServer creates a new instance of a grpc RefServer
-func NewServer(rs *rubyserver.Server) gitalypb.RefServiceServer {
-	return &server{ruby: rs}
+func NewServer() gitalypb.RefServiceServer {
+	return &server{}
 }
diff --git a/internal/service/ref/testhelper_test.go b/internal/service/ref/testhelper_test.go
index 5f2313ec8..2faeb3d0e 100644
--- a/internal/service/ref/testhelper_test.go
+++ b/internal/service/ref/testhelper_test.go
@@ -7,10 +7,8 @@ import (
 	"testing"
 
 	"github.com/golang/protobuf/ptypes/timestamp"
-	log "github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/require"
 	"gitlab.com/gitlab-org/gitaly/internal/helper/lines"
-	"gitlab.com/gitlab-org/gitaly/internal/rubyserver"
 	"gitlab.com/gitlab-org/gitaly/internal/testhelper"
 	"gitlab.com/gitlab-org/gitaly/proto/go/gitalypb"
 	"google.golang.org/grpc"
@@ -84,16 +82,9 @@ func TestMain(m *testing.M) {
 	os.Exit(testMain(m))
 }
 
-var rubyServer = &rubyserver.Server{}
-
 func testMain(m *testing.M) int {
 	defer testhelper.MustHaveNoChildProcess()
 
-	if err := rubyServer.Start(); err != nil {
-		log.Fatal(err)
-	}
-	defer rubyServer.Stop()
-
 	// Force small messages to test that fragmenting the
 	// ref list works correctly
 	lines.ItemsPerMessage = 3
@@ -110,7 +101,7 @@ func runRefServiceServer(t *testing.T) (*grpc.Server, string) {
 		t.Fatal(err)
 	}
 
-	gitalypb.RegisterRefServiceServer(grpcServer, &server{ruby: rubyServer})
+	gitalypb.RegisterRefServiceServer(grpcServer, &server{})
 	reflection.Register(grpcServer)
 
 	go grpcServer.Serve(listener)
diff --git a/internal/service/register.go b/internal/service/register.go
index 5f2e168ec..119b01fa1 100644
--- a/internal/service/register.go
+++ b/internal/service/register.go
@@ -33,7 +33,7 @@ func RegisterAll(grpcServer *grpc.Server, rubyServer *rubyserver.Server) {
 	gitalypb.RegisterDiffServiceServer(grpcServer, diff.NewServer())
 	gitalypb.RegisterNamespaceServiceServer(grpcServer, namespace.NewServer())
 	gitalypb.RegisterOperationServiceServer(grpcServer, operations.NewServer(rubyServer))
-	gitalypb.RegisterRefServiceServer(grpcServer, ref.NewServer(rubyServer))
+	gitalypb.RegisterRefServiceServer(grpcServer, ref.NewServer())
 	gitalypb.RegisterRepositoryServiceServer(grpcServer, repository.NewServer(rubyServer))
 	gitalypb.RegisterSSHServiceServer(grpcServer, ssh.NewServer())
 	gitalypb.RegisterSmartHTTPServiceServer(grpcServer, smarthttp.NewServer())
diff --git a/proto/go/gitalypb/ref.pb.go b/proto/go/gitalypb/ref.pb.go
index f7b1e0c4c..b027de455 100644
--- a/proto/go/gitalypb/ref.pb.go
+++ b/proto/go/gitalypb/ref.pb.go
@@ -2089,115 +2089,113 @@ func init() {
 func init() { proto.RegisterFile("ref.proto", fileDescriptor_65d958559ea81b29) }
 
 var fileDescriptor_65d958559ea81b29 = []byte{
-	// 1730 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x59, 0x5f, 0x6f, 0x1b, 0x4b,
-	0x15, 0xef, 0x3a, 0x89, 0x63, 0x1f, 0xbb, 0xce, 0x66, 0xf2, 0xcf, 0xd9, 0xb4, 0x4d, 0x3a, 0xfd,
-	0x97, 0xd0, 0xe2, 0x94, 0x54, 0x20, 0x24, 0x90, 0xc0, 0x49, 0x4c, 0x1b, 0xd2, 0x3a, 0x61, 0xec,
-	0xd2, 0x16, 0x21, 0x56, 0x6b, 0x7b, 0xbc, 0x59, 0x58, 0x7b, 0xcd, 0xee, 0xa4, 0x6d, 0xe0, 0x8d,
-	0xf2, 0x88, 0x84, 0x04, 0x42, 0xf0, 0xc0, 0x33, 0x1f, 0x81, 0x8f, 0x80, 0x90, 0xae, 0xee, 0x17,
-	0xba, 0x4f, 0x57, 0x3b, 0x33, 0xfb, 0xcf, 0x5e, 0x3b, 0x91, 0xe2, 0xea, 0xde, 0xa7, 0x78, 0xce,
-	0x9c, 0xf3, 0x3b, 0x67, 0xce, 0x1c, 0x9f, 0xf3, 0x1b, 0x07, 0xf2, 0x2e, 0xed, 0x56, 0x06, 0xae,
-	0xc3, 0x1c, 0x94, 0x35, 0x2d, 0x66, 0xd8, 0x17, 0x1a, 0xb4, 0x6c, 0xa7, 0x25, 0x64, 0x5a, 0xd1,
-	0x3b, 0x33, 0x5c, 0xda, 0x91, 0xab, 0x4d, 0xd3, 0x71, 0x4c, 0x9b, 0xee, 0xf2, 0x55, 0xeb, 0xbc,
-	0xbb, 0xcb, 0xac, 0x1e, 0xf5, 0x98, 0xd1, 0x1b, 0x08, 0x05, 0xfc, 0x27, 0x05, 0x96, 0x5e, 0x5a,
-	0x1e, 0xab, 0xd3, 0x0f, 0xfb, 0xb6, 0xd3, 0xf2, 0x08, 0xfd, 0xfd, 0x39, 0xf5, 0x18, 0xfa, 0x21,
-	0x80, 0x4b, 0x07, 0x8e, 0x67, 0x31, 0xc7, 0xbd, 0x28, 0x2b, 0x5b, 0xca, 0x76, 0x61, 0x0f, 0x55,
-	0x84, 0xbf, 0x0a, 0x09, 0x77, 0xf6, 0x67, 0xff, 0xf5, 0xbf, 0x27, 0x0a, 0x89, 0xe9, 0xa2, 0x0d,
-	0xc8, 0xb7, 0x9d, 0x5e, 0xcf, 0x62, 0xba, 0xd5, 0x29, 0x67, 0xb6, 0x94, 0xed, 0x3c, 0xc9, 0x09,
-	0xc1, 0x51, 0x07, 0x2d, 0xc3, 0x9c, 0x6d, 0xf5, 0x2c, 0x56, 0x9e, 0xd9, 0x52, 0xb6, 0x6f, 0x12,
-	0xb1, 0xc0, 0x6f, 0x60, 0x39, 0x19, 0x83, 0x37, 0x70, 0xfa, 0x1e, 0x45, 0x3f, 0x01, 0xb5, 0x4f,
-	0x3f, 0xe8, 0xfe, 0xe9, 0x74, 0xa7, 0xf5, 0x5b, 0xda, 0x66, 0x5e, 0x59, 0xd9, 0x9a, 0xd9, 0x2e,
-	0xec, 0xad, 0x04, 0xa1, 0x48, 0x9b, 0x13, 0xbe, 0x4b, 0x4a, 0xfd, 0xf8, 0xd2, 0xc3, 0x6f, 0xe1,
-	0xd6, 0xcf, 0xac, 0x7e, 0xe7, 0x90, 0x76, 0x8d, 0x73, 0x9b, 0xed, 0xbb, 0x46, 0xbf, 0x7d, 0x56,
-	0x37, 0x7a, 0xf4, 0xda, 0xa7, 0xc4, 0xcf, 0xe0, 0xf6, 0x18, 0x64, 0x19, 0x3b, 0x82, 0xd9, 0xbe,
-	0xd1, 0xa3, 0x1c, 0xb4, 0x48, 0xf8, 0x67, 0xfc, 0x1a, 0xd6, 0x7d, 0xa3, 0xaa, 0x6d, 0x47, 0x06,
-	0xd7, 0xcf, 0x38, 0xde, 0x03, 0x2d, 0x0d, 0x56, 0x06, 0xb2, 0x0c, 0x73, 0xbe, 0x73, 0x91, 0xb9,
-	0x22, 0x11, 0x0b, 0x4c, 0x60, 0x55, 0xda, 0x34, 0x0d, 0x73, 0x4a, 0x71, 0xec, 0xc2, 0xda, 0x08,
-	0xe6, 0xc4, 0x20, 0x3e, 0x29, 0x80, 0x7c, 0x0b, 0x42, 0xbb, 0x53, 0xb9, 0x95, 0xc9, 0xb5, 0xb7,
-	0x0a, 0xd9, 0x81, 0x4b, 0xbb, 0xd6, 0x47, 0x5e, 0x7c, 0x45, 0x22, 0x57, 0x78, 0x07, 0x96, 0x12,
-	0x41, 0x4c, 0xb8, 0xc0, 0x2f, 0x15, 0x28, 0xfb, 0xba, 0x2f, 0x9d, 0xb6, 0x21, 0x93, 0x3d, 0x85,
-	0xc4, 0xa1, 0x9f, 0xc2, 0xbc, 0xe7, 0xb8, 0x4c, 0x6f, 0x5d, 0xf0, 0xa0, 0x4b, 0x7b, 0x8f, 0x02,
-	0xb3, 0x71, 0xce, 0x2a, 0x0d, 0xc7, 0x65, 0xfb, 0x17, 0x24, 0xeb, 0xf1, 0xbf, 0xf8, 0xfb, 0x90,
-	0x15, 0x12, 0x94, 0x83, 0xd9, 0x7a, 0xf5, 0x55, 0x4d, 0xbd, 0x81, 0x16, 0xa0, 0xf0, 0xfa, 0xf4,
-	0xb0, 0xda, 0xac, 0x1d, 0xea, 0xd5, 0xc6, 0x81, 0xaa, 0x20, 0x15, 0x8a, 0x81, 0xe0, 0xb0, 0xd6,
-	0x38, 0x50, 0x33, 0xf8, 0xad, 0x28, 0xc8, 0x21, 0x0f, 0x32, 0x01, 0x3f, 0x82, 0x5c, 0x4b, 0xca,
-	0xe4, 0xb7, 0x6e, 0x73, 0x4c, 0x58, 0x81, 0x09, 0x09, 0x0d, 0xf0, 0x7f, 0x33, 0xa2, 0x18, 0x52,
-	0xb4, 0xd2, 0x32, 0x3b, 0xf9, 0xe6, 0x1e, 0x40, 0x49, 0x6e, 0x7a, 0xe7, 0xfc, 0x9b, 0x2d, 0x6f,
-	0xf0, 0xa6, 0x90, 0x36, 0x84, 0x10, 0xbd, 0x00, 0x29, 0xd0, 0x8d, 0x73, 0x76, 0xe6, 0xb8, 0xe5,
-	0x59, 0x7e, 0x07, 0xf7, 0xc6, 0x44, 0x7d, 0xc0, 0x75, 0xab, 0x5c, 0x95, 0x14, 0xdb, 0xb1, 0x15,
-	0xaa, 0x83, 0x2a, 0x91, 0xc4, 0x1f, 0x46, 0xdd, 0xf2, 0xdc, 0xd5, 0xc1, 0x16, 0x84, 0xd5, 0x41,
-	0x60, 0x8b, 0x76, 0x20, 0x2b, 0x44, 0xe5, 0x2c, 0x47, 0x59, 0x0c, 0x50, 0x9e, 0x07, 0x5a, 0x44,
-	0x2a, 0xe0, 0xbf, 0x2b, 0xb0, 0x31, 0x01, 0x3b, 0x35, 0x79, 0xcb, 0x30, 0x47, 0x7b, 0x86, 0x65,
-	0xf3, 0xc4, 0x15, 0x89, 0x58, 0xa0, 0x0a, 0xcc, 0x76, 0x0c, 0x46, 0x79, 0xae, 0x0a, 0x7b, 0x5a,
-	0x45, 0x8c, 0x82, 0x4a, 0x30, 0x0a, 0x2a, 0xcd, 0x60, 0x14, 0x10, 0xae, 0x87, 0x34, 0xc8, 0xf9,
-	0xd3, 0xe1, 0x0f, 0x4e, 0x9f, 0xf2, 0xcc, 0x15, 0x49, 0xb8, 0xc6, 0xff, 0x56, 0xc2, 0x7e, 0x31,
-	0xbd, 0xb2, 0xdf, 0x84, 0x42, 0x8f, 0xba, 0x26, 0xed, 0xe8, 0x4e, 0xdf, 0x16, 0xa5, 0x9f, 0x23,
-	0x20, 0x44, 0x27, 0x7d, 0xfb, 0x02, 0x3d, 0x82, 0x05, 0xa9, 0x10, 0x16, 0xe2, 0x0c, 0xef, 0x1f,
-	0x25, 0x21, 0x0e, 0x42, 0xc1, 0xff, 0x51, 0xc2, 0xd6, 0x33, 0x52, 0xc6, 0xfb, 0x23, 0x65, 0xfc,
-	0x30, 0x7e, 0x87, 0x29, 0x26, 0x15, 0x59, 0xaf, 0xa1, 0x9d, 0xf6, 0x1c, 0xb2, 0x42, 0x96, 0x9a,
-	0xfe, 0x1d, 0xc8, 0x32, 0xc3, 0x35, 0x29, 0xe3, 0x47, 0x48, 0xbf, 0x5d, 0xa1, 0x80, 0x29, 0x94,
-	0x7c, 0xa7, 0x4d, 0xc3, 0xbc, 0x7e, 0xfa, 0xd6, 0x21, 0xc7, 0x0c, 0x53, 0xe7, 0xe1, 0x88, 0x8b,
-	0x9f, 0x67, 0xa2, 0xef, 0xe2, 0xa7, 0xb0, 0x10, 0xba, 0x91, 0x69, 0xb8, 0x0d, 0x33, 0xcc, 0x30,
-	0xa5, 0x83, 0x42, 0xe0, 0xc0, 0xd7, 0xf0, 0xe5, 0xb8, 0x2e, 0x3a, 0xb1, 0xe8, 0xdd, 0x53, 0x98,
-	0x05, 0x3f, 0x10, 0x4d, 0x35, 0xc4, 0x93, 0x51, 0x6c, 0xc2, 0x2c, 0x33, 0xcc, 0xe0, 0x22, 0x12,
-	0x61, 0xf0, 0x0d, 0xfc, 0x1b, 0x50, 0x09, 0xed, 0xd6, 0x3e, 0x5a, 0x1e, 0x9b, 0x42, 0x85, 0xa9,
-	0x30, 0xe3, 0xd2, 0xae, 0xcc, 0x8e, 0xff, 0x11, 0xef, 0xc0, 0x62, 0x0c, 0x3f, 0x9a, 0x4e, 0xef,
-	0x0d, 0xfb, 0x5c, 0xdc, 0x6a, 0x8e, 0x88, 0x05, 0xfe, 0xb3, 0x02, 0x4b, 0x07, 0x2e, 0x35, 0x18,
-	0x0d, 0xfa, 0xd7, 0x75, 0xc3, 0x09, 0x8a, 0x27, 0x13, 0x2b, 0x9e, 0x4d, 0x28, 0x78, 0xcc, 0x70,
-	0x99, 0x3e, 0x70, 0xac, 0x7e, 0xd0, 0xd8, 0x80, 0x8b, 0x4e, 0x7d, 0x09, 0xfe, 0x42, 0x81, 0xe5,
-	0x64, 0x18, 0x61, 0x7f, 0xce, 0x7a, 0xcc, 0x60, 0xe7, 0x1e, 0x8f, 0xa1, 0x14, 0xb5, 0xa6, 0x34,
-	0xed, 0x4a, 0x83, 0xab, 0x12, 0x69, 0x82, 0x1e, 0x42, 0x56, 0x54, 0xb7, 0xac, 0xd9, 0x52, 0x60,
-	0x2c, 0xcd, 0xe4, 0x2e, 0xae, 0x43, 0x56, 0x58, 0xa2, 0x2c, 0x64, 0x4e, 0x8e, 0xd5, 0x1b, 0xa8,
-	0x04, 0x50, 0x23, 0x44, 0xaf, 0xbd, 0x3d, 0x6a, 0x34, 0x1b, 0xaa, 0xe2, 0x8f, 0x19, 0x7f, 0x7d,
-	0x54, 0xff, 0x65, 0xf5, 0xe5, 0xd1, 0xa1, 0x9a, 0x41, 0x1b, 0xb0, 0x16, 0x13, 0xe8, 0x8d, 0x66,
-	0x95, 0x34, 0xf5, 0xd3, 0x93, 0xa3, 0x7a, 0x53, 0x9d, 0xc1, 0x6d, 0x58, 0x3a, 0xa4, 0x36, 0xfd,
-	0xac, 0x39, 0xc5, 0xab, 0xb0, 0x9c, 0x74, 0x22, 0x72, 0x80, 0x0d, 0x58, 0xf4, 0x8b, 0xf2, 0x73,
-	0xba, 0xfe, 0xb1, 0xf8, 0x1e, 0x0d, 0x5d, 0x55, 0x94, 0x6d, 0x65, 0x62, 0xb6, 0xff, 0xaa, 0xc0,
-	0xa2, 0x88, 0x9c, 0xd0, 0xee, 0x14, 0xea, 0xff, 0x09, 0x20, 0xfa, 0xb1, 0x4d, 0x07, 0x4c, 0xff,
-	0x60, 0xb1, 0x33, 0x5d, 0xd2, 0x9f, 0x0c, 0xef, 0xa1, 0xaa, 0xd8, 0x79, 0x63, 0xb1, 0xb3, 0x53,
-	0x2e, 0xf7, 0xcf, 0xe3, 0xd2, 0x6e, 0xd0, 0x63, 0xf9, 0x67, 0xfc, 0x3d, 0x40, 0xf1, 0x80, 0xe4,
-	0x79, 0x36, 0x20, 0x6f, 0x5a, 0x4c, 0xa7, 0xae, 0xeb, 0xb8, 0x3c, 0xa0, 0x3c, 0xc9, 0x99, 0x16,
-	0xab, 0xf9, 0x6b, 0xfc, 0x0f, 0x05, 0x1e, 0xfa, 0x74, 0x3e, 0x46, 0x46, 0x0f, 0x9c, 0x3e, 0x33,
-	0xac, 0xbe, 0xd5, 0x37, 0x65, 0x3f, 0xfc, 0x26, 0x5e, 0x19, 0x04, 0x1e, 0x5d, 0x1a, 0x96, 0x3c,
-	0xdf, 0x5d, 0x28, 0x8a, 0x1b, 0xd1, 0x05, 0x6b, 0x15, 0x19, 0x2b, 0xb4, 0x22, 0xd3, 0x9f, 0xcf,
-	0xe6, 0x14, 0x35, 0x83, 0xff, 0xa6, 0xc0, 0x3d, 0x1f, 0x34, 0x20, 0xbc, 0xdf, 0x8a, 0x83, 0x1e,
-	0xc1, 0xfd, 0xc9, 0x31, 0x45, 0xb7, 0x18, 0x0c, 0x90, 0xe0, 0x88, 0x39, 0x39, 0x41, 0x82, 0xf3,
-	0xfd, 0x11, 0x56, 0x9e, 0x53, 0x1f, 0xe9, 0x15, 0xf5, 0x3c, 0xc3, 0x9c, 0xc6, 0xd4, 0x5f, 0x03,
-	0x7f, 0x4c, 0xe9, 0x56, 0x47, 0x14, 0x5a, 0xde, 0x9f, 0x8d, 0xe6, 0x51, 0xc7, 0xf7, 0x98, 0x51,
-	0x67, 0x48, 0x14, 0x12, 0x7e, 0x07, 0xab, 0xc3, 0xce, 0x65, 0xe4, 0x65, 0x98, 0xef, 0x09, 0x59,
-	0x30, 0xf9, 0xe4, 0x12, 0xad, 0xf8, 0xb3, 0xd8, 0x47, 0xe7, 0x29, 0xc9, 0x93, 0x39, 0x0e, 0x2e,
-	0x4e, 0x43, 0xc2, 0x79, 0x89, 0xfb, 0xb0, 0x22, 0x5f, 0x9c, 0x22, 0x27, 0x9f, 0xf9, 0xdd, 0x8b,
-	0x6b, 0xb0, 0x3a, 0xec, 0x4f, 0x1e, 0xe5, 0x31, 0xcc, 0x0b, 0xad, 0x60, 0x28, 0xa6, 0xb0, 0x87,
-	0x40, 0x03, 0x5f, 0x88, 0xf7, 0x6c, 0xd5, 0xb6, 0x09, 0xed, 0x39, 0x41, 0x7f, 0x9b, 0x12, 0x17,
-	0x73, 0x39, 0x64, 0xc4, 0x27, 0xf2, 0xbe, 0x82, 0x2f, 0xe2, 0x94, 0xe2, 0x58, 0x3c, 0x78, 0x53,
-	0x5c, 0xcb, 0x83, 0x7c, 0x67, 0x84, 0x67, 0x0d, 0x77, 0xb9, 0xe8, 0x75, 0xd0, 0x85, 0x85, 0x53,
-	0xa3, 0xfd, 0xbb, 0xe9, 0x34, 0xb9, 0x75, 0xc8, 0x19, 0xb6, 0xad, 0xf3, 0xd6, 0x25, 0x38, 0xe4,
-	0xbc, 0xe1, 0x47, 0xd9, 0xf5, 0x30, 0x02, 0x35, 0xf2, 0x23, 0xe2, 0xdc, 0xfb, 0x7f, 0x09, 0x80,
-	0xd0, 0x6e, 0x83, 0xba, 0xef, 0xad, 0x36, 0x45, 0x36, 0xac, 0xa4, 0x3e, 0xe4, 0xd1, 0xfd, 0x38,
-	0x4b, 0x1c, 0xf7, 0x0b, 0x82, 0xf6, 0xe0, 0x12, 0x2d, 0x39, 0x79, 0xb2, 0x5f, 0xfd, 0x73, 0x3b,
-	0x93, 0xcb, 0x20, 0x1a, 0xd2, 0xac, 0x58, 0x1b, 0x42, 0x77, 0x53, 0x09, 0x69, 0xfc, 0x55, 0xae,
-	0xe1, 0x49, 0x2a, 0x49, 0x27, 0x4f, 0x15, 0xf4, 0x6b, 0xc1, 0xff, 0x62, 0x2f, 0x71, 0x74, 0x67,
-	0x08, 0x60, 0xe8, 0xd9, 0xaf, 0x6d, 0x8e, 0xdd, 0x1f, 0x41, 0xaf, 0x43, 0x21, 0xf6, 0x60, 0x46,
-	0x5a, 0xdc, 0x32, 0xf9, 0x94, 0xd7, 0x36, 0x52, 0xf7, 0x86, 0x92, 0xd2, 0x12, 0x63, 0x39, 0xf1,
-	0x0a, 0x45, 0x5b, 0x97, 0x3d, 0x81, 0xb5, 0xbb, 0x13, 0x34, 0x26, 0x64, 0x24, 0xf4, 0x70, 0x67,
-	0xec, 0x33, 0x20, 0x3d, 0x23, 0x13, 0xd0, 0x4f, 0x45, 0x46, 0x24, 0xdb, 0x4d, 0x66, 0x24, 0x49,
-	0xa9, 0x93, 0x19, 0x19, 0xa2, 0xc7, 0x31, 0xc4, 0x7d, 0x98, 0x97, 0x0c, 0x1e, 0xad, 0xc6, 0x2d,
-	0xa2, 0x97, 0x83, 0xb6, 0x36, 0x22, 0x1f, 0xca, 0x6b, 0x5f, 0x94, 0xf6, 0xc8, 0x57, 0x36, 0x59,
-	0xda, 0xe3, 0x9a, 0x49, 0xb2, 0xb4, 0xc7, 0x7e, 0xef, 0x63, 0x31, 0xbf, 0x80, 0x7c, 0xc8, 0xad,
-	0x51, 0x39, 0xfa, 0xee, 0x26, 0xe9, 0xbc, 0xb6, 0x9e, 0xb2, 0x33, 0x14, 0xf9, 0x2f, 0xa0, 0x18,
-	0x27, 0xb1, 0x68, 0x23, 0x9d, 0xda, 0x0a, 0xbc, 0x5b, 0x93, 0x78, 0xaf, 0x84, 0x54, 0x7c, 0xc8,
-	0x38, 0x27, 0x8c, 0x20, 0x53, 0xe8, 0x68, 0x04, 0x99, 0x4a, 0x23, 0x03, 0xc8, 0x63, 0x80, 0x88,
-	0xeb, 0xa1, 0xf5, 0x78, 0xba, 0x92, 0x70, 0x5a, 0xda, 0xd6, 0xd0, 0x91, 0x8f, 0x01, 0x22, 0xa2,
-	0x15, 0x81, 0x8d, 0xb0, 0xc1, 0x08, 0x6c, 0x94, 0x97, 0x85, 0x91, 0xfd, 0x45, 0x81, 0xcd, 0x4b,
-	0xb8, 0x0e, 0xaa, 0x04, 0x38, 0x57, 0xe3, 0x6a, 0xda, 0xee, 0x95, 0xf5, 0x47, 0x0a, 0xe3, 0x93,
-	0x02, 0xb7, 0x26, 0x31, 0x12, 0xf4, 0x38, 0x8e, 0x7d, 0x09, 0x97, 0xd2, 0x9e, 0x5c, 0x4d, 0x79,
-	0x24, 0x8a, 0x77, 0x50, 0x4a, 0xd2, 0x09, 0x74, 0x3b, 0x1c, 0xb5, 0x69, 0x1c, 0x47, 0xbb, 0x33,
-	0x6e, 0x3b, 0x0d, 0x3a, 0x39, 0xde, 0x23, 0xe8, 0x54, 0x9a, 0x11, 0x41, 0xa7, 0xb3, 0x82, 0x18,
-	0x74, 0x03, 0x8a, 0xf1, 0xdf, 0xc6, 0xa3, 0xba, 0x4d, 0xf9, 0xd5, 0x3e, 0xaa, 0xdb, 0xb4, 0x9f,
-	0xd3, 0x63, 0xa0, 0x35, 0xc8, 0x05, 0x73, 0x11, 0x85, 0x6d, 0x64, 0x68, 0x22, 0x6b, 0xe5, 0xd1,
-	0x8d, 0x64, 0x99, 0xed, 0x3f, 0xfd, 0x95, 0xaf, 0x62, 0x1b, 0xad, 0x4a, 0xdb, 0xe9, 0xed, 0x8a,
-	0x8f, 0xdf, 0x75, 0x5c, 0x73, 0x57, 0x18, 0x8a, 0xff, 0x3a, 0xec, 0x9a, 0x8e, 0x5c, 0x0f, 0x5a,
-	0xad, 0x2c, 0x17, 0x3d, 0xfb, 0x3a, 0x00, 0x00, 0xff, 0xff, 0x50, 0x11, 0x7c, 0x1b, 0xc5, 0x18,
+	// 1698 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x58, 0x4b, 0x6f, 0x1b, 0xc9,
+	0x11, 0xf6, 0x50, 0x12, 0x45, 0x16, 0x69, 0x6a, 0xd4, 0x7a, 0x51, 0x23, 0xdb, 0x92, 0xdb, 0x2f,
+	0x29, 0x76, 0x28, 0x47, 0x46, 0x82, 0x00, 0x09, 0x90, 0x50, 0x12, 0x63, 0x2b, 0xb6, 0x29, 0xa1,
+	0x49, 0xc7, 0x76, 0x10, 0x64, 0x30, 0x24, 0x9b, 0xa3, 0x49, 0x86, 0x1c, 0x66, 0xa6, 0x65, 0x5b,
+	0xc9, 0x2d, 0xce, 0x31, 0x40, 0x80, 0x04, 0x41, 0x72, 0xd8, 0xd3, 0x1e, 0xf6, 0x27, 0xec, 0x4f,
+	0xd8, 0xcb, 0x62, 0xff, 0xd0, 0x9e, 0x16, 0xd3, 0xdd, 0xf3, 0x22, 0x87, 0x94, 0x00, 0xd1, 0xd8,
+	0x3d, 0x91, 0x5d, 0x5d, 0xf5, 0x55, 0x75, 0x75, 0x75, 0x3d, 0x06, 0xf2, 0x2e, 0xed, 0x56, 0x06,
+	0xae, 0xc3, 0x1c, 0x94, 0x35, 0x2d, 0x66, 0xd8, 0xe7, 0x1a, 0xb4, 0x6c, 0xa7, 0x25, 0x68, 0x5a,
+	0xd1, 0x3b, 0x35, 0x5c, 0xda, 0x91, 0xab, 0x4d, 0xd3, 0x71, 0x4c, 0x9b, 0xee, 0xf2, 0x55, 0xeb,
+	0xac, 0xbb, 0xcb, 0xac, 0x1e, 0xf5, 0x98, 0xd1, 0x1b, 0x08, 0x06, 0xfc, 0x77, 0x05, 0x96, 0x5e,
+	0x58, 0x1e, 0xab, 0xd3, 0xf7, 0xfb, 0xb6, 0xd3, 0xf2, 0x08, 0xfd, 0xcb, 0x19, 0xf5, 0x18, 0xfa,
+	0x39, 0x80, 0x4b, 0x07, 0x8e, 0x67, 0x31, 0xc7, 0x3d, 0x2f, 0x2b, 0x5b, 0xca, 0x76, 0x61, 0x0f,
+	0x55, 0x84, 0xbe, 0x0a, 0x09, 0x77, 0xf6, 0x67, 0xff, 0xff, 0xd5, 0x23, 0x85, 0xc4, 0x78, 0xd1,
+	0x06, 0xe4, 0xdb, 0x4e, 0xaf, 0x67, 0x31, 0xdd, 0xea, 0x94, 0x33, 0x5b, 0xca, 0x76, 0x9e, 0xe4,
+	0x04, 0xe1, 0xa8, 0x83, 0x96, 0x61, 0xce, 0xb6, 0x7a, 0x16, 0x2b, 0xcf, 0x6c, 0x29, 0xdb, 0xd7,
+	0x89, 0x58, 0xe0, 0xd7, 0xb0, 0x9c, 0xb4, 0xc1, 0x1b, 0x38, 0x7d, 0x8f, 0xa2, 0x5f, 0x81, 0xda,
+	0xa7, 0xef, 0x75, 0xff, 0x74, 0xba, 0xd3, 0xfa, 0x13, 0x6d, 0x33, 0xaf, 0xac, 0x6c, 0xcd, 0x6c,
+	0x17, 0xf6, 0x56, 0x02, 0x53, 0xa4, 0xcc, 0x31, 0xdf, 0x25, 0xa5, 0x7e, 0x7c, 0xe9, 0xe1, 0x37,
+	0x70, 0xe3, 0x37, 0x56, 0xbf, 0x73, 0x48, 0xbb, 0xc6, 0x99, 0xcd, 0xf6, 0x5d, 0xa3, 0xdf, 0x3e,
+	0xad, 0x1b, 0x3d, 0x7a, 0xe5, 0x53, 0xe2, 0x27, 0x70, 0x73, 0x0c, 0xb2, 0xb4, 0x1d, 0xc1, 0x6c,
+	0xdf, 0xe8, 0x51, 0x0e, 0x5a, 0x24, 0xfc, 0x3f, 0x7e, 0x05, 0xeb, 0xbe, 0x50, 0xd5, 0xb6, 0x23,
+	0x81, 0xab, 0x7b, 0x1c, 0xef, 0x81, 0x96, 0x06, 0x2b, 0x0d, 0x59, 0x86, 0x39, 0x5f, 0xb9, 0xf0,
+	0x5c, 0x91, 0x88, 0x05, 0x26, 0xb0, 0x2a, 0x65, 0x9a, 0x86, 0x39, 0x25, 0x3b, 0x76, 0x61, 0x6d,
+	0x04, 0x73, 0xa2, 0x11, 0x1f, 0x15, 0x40, 0xbe, 0x04, 0xa1, 0xdd, 0xa9, 0xdc, 0xca, 0xe4, 0xd8,
+	0x5b, 0x85, 0xec, 0xc0, 0xa5, 0x5d, 0xeb, 0x03, 0x0f, 0xbe, 0x22, 0x91, 0x2b, 0xbc, 0x03, 0x4b,
+	0x09, 0x23, 0x26, 0x5c, 0xe0, 0x37, 0x0a, 0x94, 0x7d, 0xde, 0x17, 0x4e, 0xdb, 0x90, 0xce, 0x9e,
+	0x82, 0xe3, 0xd0, 0xaf, 0x61, 0xde, 0x73, 0x5c, 0xa6, 0xb7, 0xce, 0xb9, 0xd1, 0xa5, 0xbd, 0x07,
+	0x81, 0xd8, 0x38, 0x65, 0x95, 0x86, 0xe3, 0xb2, 0xfd, 0x73, 0x92, 0xf5, 0xf8, 0x2f, 0xfe, 0x29,
+	0x64, 0x05, 0x05, 0xe5, 0x60, 0xb6, 0x5e, 0x7d, 0x59, 0x53, 0xaf, 0xa1, 0x05, 0x28, 0xbc, 0x3a,
+	0x39, 0xac, 0x36, 0x6b, 0x87, 0x7a, 0xb5, 0x71, 0xa0, 0x2a, 0x48, 0x85, 0x62, 0x40, 0x38, 0xac,
+	0x35, 0x0e, 0xd4, 0x0c, 0x7e, 0x23, 0x02, 0x72, 0x48, 0x83, 0x74, 0xc0, 0x2f, 0x20, 0xd7, 0x92,
+	0x34, 0xf9, 0xea, 0x36, 0xc7, 0x98, 0x15, 0x88, 0x90, 0x50, 0x00, 0x7f, 0x99, 0x11, 0xc1, 0x90,
+	0xc2, 0x95, 0xe6, 0xd9, 0xc9, 0x37, 0x77, 0x0f, 0x4a, 0x72, 0xd3, 0x3b, 0xe3, 0x2f, 0x5b, 0xde,
+	0xe0, 0x75, 0x41, 0x6d, 0x08, 0x22, 0x7a, 0x06, 0x92, 0xa0, 0x1b, 0x67, 0xec, 0xd4, 0x71, 0xcb,
+	0xb3, 0xfc, 0x0e, 0xee, 0x8c, 0xb1, 0xfa, 0x80, 0xf3, 0x56, 0x39, 0x2b, 0x29, 0xb6, 0x63, 0x2b,
+	0x54, 0x07, 0x55, 0x22, 0x89, 0x1f, 0x46, 0xdd, 0xf2, 0xdc, 0xe5, 0xc1, 0x16, 0x84, 0xd4, 0x41,
+	0x20, 0x8b, 0x76, 0x20, 0x2b, 0x48, 0xe5, 0x2c, 0x47, 0x59, 0x0c, 0x50, 0x9e, 0x06, 0x5c, 0x44,
+	0x32, 0xe0, 0xff, 0x28, 0xb0, 0x31, 0x01, 0x3b, 0xd5, 0x79, 0xcb, 0x30, 0x47, 0x7b, 0x86, 0x65,
+	0x73, 0xc7, 0x15, 0x89, 0x58, 0xa0, 0x0a, 0xcc, 0x76, 0x0c, 0x46, 0xb9, 0xaf, 0x0a, 0x7b, 0x5a,
+	0x45, 0x94, 0x82, 0x4a, 0x50, 0x0a, 0x2a, 0xcd, 0xa0, 0x14, 0x10, 0xce, 0x87, 0x34, 0xc8, 0xf9,
+	0xd5, 0xe1, 0xaf, 0x4e, 0x9f, 0x72, 0xcf, 0x15, 0x49, 0xb8, 0xc6, 0x9f, 0x29, 0x61, 0xbe, 0x98,
+	0x5e, 0xd8, 0x6f, 0x42, 0xa1, 0x47, 0x5d, 0x93, 0x76, 0x74, 0xa7, 0x6f, 0x8b, 0xd0, 0xcf, 0x11,
+	0x10, 0xa4, 0xe3, 0xbe, 0x7d, 0x8e, 0x1e, 0xc0, 0x82, 0x64, 0x08, 0x03, 0x71, 0x86, 0xe7, 0x8f,
+	0x92, 0x20, 0x07, 0xa6, 0xe0, 0x2f, 0x94, 0x30, 0xf5, 0x8c, 0x84, 0xf1, 0xfe, 0x48, 0x18, 0xdf,
+	0x8f, 0xdf, 0x61, 0x8a, 0x48, 0x45, 0xc6, 0x6b, 0x28, 0xa7, 0x3d, 0x85, 0xac, 0xa0, 0xa5, 0xba,
+	0x7f, 0x07, 0xb2, 0xcc, 0x70, 0x4d, 0xca, 0xf8, 0x11, 0xd2, 0x6f, 0x57, 0x30, 0x60, 0x0a, 0x25,
+	0x5f, 0x69, 0xd3, 0x30, 0xaf, 0xee, 0xbe, 0x75, 0xc8, 0x31, 0xc3, 0xd4, 0xb9, 0x39, 0xe2, 0xe2,
+	0xe7, 0x99, 0xc8, 0xbb, 0xf8, 0x31, 0x2c, 0x84, 0x6a, 0xa4, 0x1b, 0x6e, 0xc2, 0x0c, 0x33, 0x4c,
+	0xa9, 0xa0, 0x10, 0x28, 0xf0, 0x39, 0x7c, 0x3a, 0xae, 0x8b, 0x4c, 0x2c, 0x72, 0xf7, 0x14, 0x6a,
+	0xc1, 0xcf, 0x44, 0x52, 0x0d, 0xf1, 0xa4, 0x15, 0x9b, 0x30, 0xcb, 0x0c, 0x33, 0xb8, 0x88, 0x84,
+	0x19, 0x7c, 0x03, 0xff, 0x11, 0x54, 0x42, 0xbb, 0xb5, 0x0f, 0x96, 0xc7, 0xa6, 0x10, 0x61, 0x2a,
+	0xcc, 0xb8, 0xb4, 0x2b, 0xbd, 0xe3, 0xff, 0xc5, 0x3b, 0xb0, 0x18, 0xc3, 0x8f, 0xaa, 0xd3, 0x3b,
+	0xc3, 0x3e, 0x13, 0xb7, 0x9a, 0x23, 0x62, 0x81, 0xff, 0xa1, 0xc0, 0xd2, 0x81, 0x4b, 0x0d, 0x46,
+	0x83, 0xfc, 0x75, 0x55, 0x73, 0x82, 0xe0, 0xc9, 0xc4, 0x82, 0x67, 0x13, 0x0a, 0x1e, 0x33, 0x5c,
+	0xa6, 0x0f, 0x1c, 0xab, 0x1f, 0x24, 0x36, 0xe0, 0xa4, 0x13, 0x9f, 0x82, 0xbf, 0x56, 0x60, 0x39,
+	0x69, 0x46, 0x98, 0x9f, 0xb3, 0x1e, 0x33, 0xd8, 0x99, 0xc7, 0x6d, 0x28, 0x45, 0xa9, 0x29, 0x8d,
+	0xbb, 0xd2, 0xe0, 0xac, 0x44, 0x8a, 0xa0, 0xfb, 0x90, 0x15, 0xd1, 0x2d, 0x63, 0xb6, 0x14, 0x08,
+	0x4b, 0x31, 0xb9, 0x8b, 0xeb, 0x90, 0x15, 0x92, 0x28, 0x0b, 0x99, 0xe3, 0xe7, 0xea, 0x35, 0x54,
+	0x02, 0xa8, 0x11, 0xa2, 0xd7, 0xde, 0x1c, 0x35, 0x9a, 0x0d, 0x55, 0xf1, 0xcb, 0x8c, 0xbf, 0x3e,
+	0xaa, 0xff, 0xae, 0xfa, 0xe2, 0xe8, 0x50, 0xcd, 0xa0, 0x0d, 0x58, 0x8b, 0x11, 0xf4, 0x46, 0xb3,
+	0x4a, 0x9a, 0xfa, 0xc9, 0xf1, 0x51, 0xbd, 0xa9, 0xce, 0xe0, 0x36, 0x2c, 0x1d, 0x52, 0x9b, 0x7e,
+	0x52, 0x9f, 0xe2, 0x55, 0x58, 0x4e, 0x2a, 0x11, 0x3e, 0xc0, 0x06, 0x2c, 0xfa, 0x41, 0xf9, 0x29,
+	0x55, 0xff, 0x52, 0xbc, 0xa3, 0xa1, 0xab, 0x8a, 0xbc, 0xad, 0x4c, 0xf4, 0xf6, 0xbf, 0x14, 0x58,
+	0x14, 0x96, 0x13, 0xda, 0x9d, 0x42, 0xfc, 0x3f, 0x02, 0x44, 0x3f, 0xb4, 0xe9, 0x80, 0xe9, 0xef,
+	0x2d, 0x76, 0xaa, 0xcb, 0xf6, 0x27, 0xc3, 0x73, 0xa8, 0x2a, 0x76, 0x5e, 0x5b, 0xec, 0xf4, 0x84,
+	0xd3, 0xfd, 0xf3, 0xb8, 0xb4, 0x1b, 0xe4, 0x58, 0xfe, 0x1f, 0xff, 0x04, 0x50, 0xdc, 0x20, 0x79,
+	0x9e, 0x0d, 0xc8, 0x9b, 0x16, 0xd3, 0xa9, 0xeb, 0x3a, 0x2e, 0x37, 0x28, 0x4f, 0x72, 0xa6, 0xc5,
+	0x6a, 0xfe, 0x1a, 0xff, 0x57, 0x81, 0xfb, 0x7e, 0x3b, 0x1f, 0x6b, 0x46, 0x0f, 0x9c, 0x3e, 0x33,
+	0xac, 0xbe, 0xd5, 0x37, 0x65, 0x3e, 0xfc, 0x3e, 0xa6, 0x0c, 0x02, 0x0f, 0x2e, 0x34, 0x4b, 0x9e,
+	0xef, 0x36, 0x14, 0xc5, 0x8d, 0xe8, 0xa2, 0x6b, 0x15, 0x1e, 0x2b, 0xb4, 0x22, 0xd1, 0xdf, 0xce,
+	0xe6, 0x14, 0x35, 0x83, 0xff, 0xad, 0xc0, 0x1d, 0x1f, 0x34, 0x68, 0x78, 0x7f, 0x10, 0x07, 0x3d,
+	0x82, 0xbb, 0x93, 0x6d, 0x8a, 0x6e, 0x31, 0x28, 0x20, 0xc1, 0x11, 0x73, 0xb2, 0x82, 0x04, 0xe7,
+	0xfb, 0x1b, 0xac, 0x3c, 0xa5, 0x3e, 0xd2, 0x4b, 0xea, 0x79, 0x86, 0x39, 0x8d, 0xaa, 0xbf, 0x06,
+	0x7e, 0x99, 0xd2, 0xad, 0x8e, 0x08, 0xb4, 0xbc, 0x5f, 0x1b, 0xcd, 0xa3, 0x8e, 0xaf, 0x31, 0xa3,
+	0xce, 0x90, 0xc8, 0x24, 0xfc, 0x16, 0x56, 0x87, 0x95, 0x4b, 0xcb, 0xcb, 0x30, 0xdf, 0x13, 0xb4,
+	0xa0, 0xf2, 0xc9, 0x25, 0x5a, 0xf1, 0x6b, 0xb1, 0x8f, 0xce, 0x5d, 0x92, 0x27, 0x73, 0x1c, 0x5c,
+	0x9c, 0x86, 0x84, 0xf5, 0x12, 0xf7, 0x61, 0x45, 0x4e, 0x9c, 0xc2, 0x27, 0x9f, 0x78, 0xee, 0xc5,
+	0x35, 0x58, 0x1d, 0xd6, 0x27, 0x8f, 0xf2, 0x10, 0xe6, 0x05, 0x57, 0x50, 0x14, 0x53, 0xba, 0x87,
+	0x80, 0x03, 0x9f, 0x8b, 0x79, 0xb6, 0x6a, 0xdb, 0x84, 0xf6, 0x9c, 0x20, 0xbf, 0x4d, 0xa9, 0x17,
+	0x73, 0x39, 0x64, 0xd4, 0x4f, 0xe4, 0x7d, 0x06, 0x9f, 0xc4, 0x5b, 0x8a, 0xe7, 0x62, 0xe0, 0x4d,
+	0x51, 0x2d, 0x0f, 0xf2, 0xa3, 0x91, 0x3e, 0x6b, 0x38, 0xcb, 0x45, 0xd3, 0x41, 0x17, 0x16, 0x4e,
+	0x8c, 0xf6, 0x9f, 0xa7, 0x93, 0xe4, 0xd6, 0x21, 0x67, 0xd8, 0xb6, 0xce, 0x53, 0x97, 0xe8, 0x21,
+	0xe7, 0x0d, 0xdf, 0xca, 0xae, 0x87, 0x11, 0xa8, 0x91, 0x1e, 0x61, 0xe7, 0xde, 0xe7, 0xd7, 0x01,
+	0x08, 0xed, 0x36, 0xa8, 0xfb, 0xce, 0x6a, 0x53, 0x64, 0xc3, 0x4a, 0xea, 0x20, 0x8f, 0xee, 0xc6,
+	0xbb, 0xc4, 0x71, 0x5f, 0x10, 0xb4, 0x7b, 0x17, 0x70, 0xc9, 0xca, 0x93, 0xfd, 0xf6, 0x7f, 0xdb,
+	0x99, 0x5c, 0x06, 0xd1, 0xb0, 0xcd, 0x8a, 0xa5, 0x21, 0x74, 0x3b, 0xb5, 0x21, 0x8d, 0x4f, 0xe5,
+	0x1a, 0x9e, 0xc4, 0x92, 0x54, 0xf2, 0x58, 0x41, 0x7f, 0x10, 0xfd, 0x5f, 0x6c, 0x12, 0x47, 0xb7,
+	0x86, 0x00, 0x86, 0xc6, 0x7e, 0x6d, 0x73, 0xec, 0xfe, 0x08, 0x7a, 0x1d, 0x0a, 0xb1, 0x81, 0x19,
+	0x69, 0x71, 0xc9, 0xe4, 0x28, 0xaf, 0x6d, 0xa4, 0xee, 0x0d, 0x39, 0xa5, 0x25, 0xca, 0x72, 0x62,
+	0x0a, 0x45, 0x5b, 0x17, 0x8d, 0xc0, 0xda, 0xed, 0x09, 0x1c, 0x13, 0x3c, 0x12, 0x6a, 0xb8, 0x35,
+	0x76, 0x0c, 0x48, 0xf7, 0xc8, 0x04, 0xf4, 0x13, 0xe1, 0x11, 0xd9, 0xed, 0x26, 0x3d, 0x92, 0x6c,
+	0xa9, 0x93, 0x1e, 0x19, 0x6a, 0x8f, 0x63, 0x88, 0xfb, 0x30, 0x2f, 0x3b, 0x78, 0xb4, 0x1a, 0x97,
+	0x88, 0x26, 0x07, 0x6d, 0x6d, 0x84, 0x3e, 0xe4, 0xd7, 0xbe, 0x08, 0xed, 0x91, 0x27, 0x9b, 0x0c,
+	0xed, 0x71, 0xc9, 0x24, 0x19, 0xda, 0x63, 0xdf, 0x7d, 0xcc, 0xe6, 0x67, 0x90, 0x0f, 0x7b, 0x6b,
+	0x54, 0x8e, 0xde, 0x6e, 0xb2, 0x9d, 0xd7, 0xd6, 0x53, 0x76, 0x86, 0x2c, 0x7f, 0x0e, 0x10, 0x75,
+	0x51, 0x68, 0x3d, 0x6e, 0x48, 0xa2, 0x79, 0xd3, 0xb4, 0xb4, 0xad, 0x51, 0xb0, 0xa8, 0x85, 0x89,
+	0xc0, 0x46, 0xfa, 0xac, 0x08, 0x6c, 0xb4, 0xe3, 0x91, 0x60, 0x0a, 0xfa, 0xa7, 0x02, 0x9b, 0x17,
+	0x74, 0x11, 0xa8, 0x12, 0xe0, 0x5c, 0xae, 0x0b, 0xd2, 0x76, 0x2f, 0xcd, 0x3f, 0xe2, 0xf2, 0x8f,
+	0x0a, 0xdc, 0x98, 0x54, 0xeb, 0xd1, 0xc3, 0x38, 0xf6, 0x05, 0x5d, 0x8a, 0xf6, 0xe8, 0x72, 0xcc,
+	0x23, 0x56, 0xbc, 0x85, 0x52, 0xb2, 0x50, 0xa3, 0x9b, 0x61, 0x11, 0x4b, 0xeb, 0x1e, 0xb4, 0x5b,
+	0xe3, 0xb6, 0xd3, 0xa0, 0x93, 0x85, 0x33, 0x82, 0x4e, 0x2d, 0xe0, 0x11, 0x74, 0x7a, 0xbd, 0x8d,
+	0x41, 0x37, 0xa0, 0x18, 0xff, 0xea, 0x8c, 0x36, 0x86, 0x24, 0xe3, 0xdf, 0xc3, 0xb5, 0x1b, 0xe9,
+	0x9b, 0x23, 0xa0, 0x35, 0xc8, 0x05, 0x15, 0x07, 0x85, 0x0f, 0x74, 0xa8, 0xd6, 0x69, 0xe5, 0xd1,
+	0x8d, 0x64, 0x98, 0xed, 0x3f, 0xfe, 0xbd, 0xcf, 0x62, 0x1b, 0xad, 0x4a, 0xdb, 0xe9, 0xed, 0x8a,
+	0xbf, 0x3f, 0x76, 0x5c, 0x73, 0x57, 0x08, 0x8a, 0xef, 0xf9, 0xbb, 0xa6, 0x23, 0xd7, 0x83, 0x56,
+	0x2b, 0xcb, 0x49, 0x4f, 0xbe, 0x0b, 0x00, 0x00, 0xff, 0xff, 0x12, 0xf7, 0x96, 0x99, 0x1f, 0x18,
 	0x00, 0x00,
 }
 
@@ -2225,8 +2223,6 @@ type RefServiceClient interface {
 	FindTag(ctx context.Context, in *FindTagRequest, opts ...grpc.CallOption) (*FindTagResponse, error)
 	FindAllRemoteBranches(ctx context.Context, in *FindAllRemoteBranchesRequest, opts ...grpc.CallOption) (RefService_FindAllRemoteBranchesClient, error)
 	RefExists(ctx context.Context, in *RefExistsRequest, opts ...grpc.CallOption) (*RefExistsResponse, error)
-	CreateBranch(ctx context.Context, in *CreateBranchRequest, opts ...grpc.CallOption) (*CreateBranchResponse, error)
-	DeleteBranch(ctx context.Context, in *DeleteBranchRequest, opts ...grpc.CallOption) (*DeleteBranchResponse, error)
 	FindBranch(ctx context.Context, in *FindBranchRequest, opts ...grpc.CallOption) (*FindBranchResponse, error)
 	DeleteRefs(ctx context.Context, in *DeleteRefsRequest, opts ...grpc.CallOption) (*DeleteRefsResponse, error)
 	ListBranchNamesContainingCommit(ctx context.Context, in *ListBranchNamesContainingCommitRequest, opts ...grpc.CallOption) (RefService_ListBranchNamesContainingCommitClient, error)
@@ -2474,24 +2470,6 @@ func (c *refServiceClient) RefExists(ctx context.Context, in *RefExistsRequest,
 	return out, nil
 }
 
-func (c *refServiceClient) CreateBranch(ctx context.Context, in *CreateBranchRequest, opts ...grpc.CallOption) (*CreateBranchResponse, error) {
-	out := new(CreateBranchResponse)
-	err := c.cc.Invoke(ctx, "/gitaly.RefService/CreateBranch", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *refServiceClient) DeleteBranch(ctx context.Context, in *DeleteBranchRequest, opts ...grpc.CallOption) (*DeleteBranchResponse, error) {
-	out := new(DeleteBranchResponse)
-	err := c.cc.Invoke(ctx, "/gitaly.RefService/DeleteBranch", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
 func (c *refServiceClient) FindBranch(ctx context.Context, in *FindBranchRequest, opts ...grpc.CallOption) (*FindBranchResponse, error) {
 	out := new(FindBranchResponse)
 	err := c.cc.Invoke(ctx, "/gitaly.RefService/FindBranch", in, out, opts...)
@@ -2693,8 +2671,6 @@ type RefServiceServer interface {
 	FindTag(context.Context, *FindTagRequest) (*FindTagResponse, error)
 	FindAllRemoteBranches(*FindAllRemoteBranchesRequest, RefService_FindAllRemoteBranchesServer) error
 	RefExists(context.Context, *RefExistsRequest) (*RefExistsResponse, error)
-	CreateBranch(context.Context, *CreateBranchRequest) (*CreateBranchResponse, error)
-	DeleteBranch(context.Context, *DeleteBranchRequest) (*DeleteBranchResponse, error)
 	FindBranch(context.Context, *FindBranchRequest) (*FindBranchResponse, error)
 	DeleteRefs(context.Context, *DeleteRefsRequest) (*DeleteRefsResponse, error)
 	ListBranchNamesContainingCommit(*ListBranchNamesContainingCommitRequest, RefService_ListBranchNamesContainingCommitServer) error
@@ -2740,12 +2716,6 @@ func (*UnimplementedRefServiceServer) FindAllRemoteBranches(req *FindAllRemoteBr
 func (*UnimplementedRefServiceServer) RefExists(ctx context.Context, req *RefExistsRequest) (*RefExistsResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method RefExists not implemented")
 }
-func (*UnimplementedRefServiceServer) CreateBranch(ctx context.Context, req *CreateBranchRequest) (*CreateBranchResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method CreateBranch not implemented")
-}
-func (*UnimplementedRefServiceServer) DeleteBranch(ctx context.Context, req *DeleteBranchRequest) (*DeleteBranchResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method DeleteBranch not implemented")
-}
 func (*UnimplementedRefServiceServer) FindBranch(ctx context.Context, req *FindBranchRequest) (*FindBranchResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method FindBranch not implemented")
 }
@@ -2973,42 +2943,6 @@ func _RefService_RefExists_Handler(srv interface{}, ctx context.Context, dec fun
 	return interceptor(ctx, in, info, handler)
 }
 
-func _RefService_CreateBranch_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(CreateBranchRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(RefServiceServer).CreateBranch(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/gitaly.RefService/CreateBranch",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(RefServiceServer).CreateBranch(ctx, req.(*CreateBranchRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _RefService_DeleteBranch_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(DeleteBranchRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(RefServiceServer).DeleteBranch(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/gitaly.RefService/DeleteBranch",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(RefServiceServer).DeleteBranch(ctx, req.(*DeleteBranchRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
 func _RefService_FindBranch_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(FindBranchRequest)
 	if err := dec(in); err != nil {
@@ -3189,14 +3123,6 @@ var _RefService_serviceDesc = grpc.ServiceDesc{
 			Handler:    _RefService_RefExists_Handler,
 		},
 		{
-			MethodName: "CreateBranch",
-			Handler:    _RefService_CreateBranch_Handler,
-		},
-		{
-			MethodName: "DeleteBranch",
-			Handler:    _RefService_DeleteBranch_Handler,
-		},
-		{
 			MethodName: "FindBranch",
 			Handler:    _RefService_FindBranch_Handler,
 		},
diff --git a/proto/ref.proto b/proto/ref.proto
index 1c39810b9..18dad2fc6 100644
--- a/proto/ref.proto
+++ b/proto/ref.proto
@@ -62,16 +62,6 @@ service RefService {
       op: ACCESSOR
     };
   }
-  rpc CreateBranch(CreateBranchRequest) returns (CreateBranchResponse) {
-    option (op_type) = {
-      op: MUTATOR
-    };
-  }
-  rpc DeleteBranch(DeleteBranchRequest) returns (DeleteBranchResponse) {
-    option (op_type) = {
-      op: MUTATOR
-    };
-  }
   rpc FindBranch(FindBranchRequest) returns (FindBranchResponse) {
     option (op_type) = {
       op: ACCESSOR
diff --git a/ruby/.rubocop_todo.yml b/ruby/.rubocop_todo.yml
index 88c94e5e2..4be800dfc 100644
--- a/ruby/.rubocop_todo.yml
+++ b/ruby/.rubocop_todo.yml
@@ -25,7 +25,6 @@ Lint/AssignmentInCondition:
   Exclude:
     - 'lib/gitaly_server/conflicts_service.rb'
     - 'lib/gitaly_server/diff_service.rb'
-    - 'lib/gitaly_server/ref_service.rb'
     - 'lib/gitaly_server/wiki_service.rb'
     - 'lib/gitlab/git/repository.rb'
     - 'lib/gitlab/version_info.rb'
@@ -159,12 +158,6 @@ Style/ModuleFunction:
   Exclude:
     - 'lib/gitlab/encoding_helper.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/MultilineIfModifier:
-  Exclude:
-    - 'lib/gitaly_server/ref_service.rb'
-
 # Offense count: 3
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedOctalStyle.
@@ -211,7 +204,6 @@ Style/RaiseArgs:
     - 'lib/gitaly_server/client.rb'
     - 'lib/gitaly_server/conflicts_service.rb'
     - 'lib/gitaly_server/operations_service.rb'
-    - 'lib/gitaly_server/ref_service.rb'
     - 'lib/gitaly_server/repository_service.rb'
     - 'lib/gitlab/git/operation_service.rb'
     - 'lib/gitlab/git/remote_repository.rb'
@@ -223,14 +215,6 @@ Style/RedundantSelf:
     - 'lib/gitlab/git.rb'
     - 'lib/gitlab/git/blob.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, AllowInnerSlashes.
-# SupportedStyles: slashes, percent_r, mixed
-Style/RegexpLiteral:
-  Exclude:
-    - 'lib/gitaly_server/ref_service.rb'
-
 # Offense count: 17
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
diff --git a/ruby/lib/gitaly_server.rb b/ruby/lib/gitaly_server.rb
index acbfd2f96..b6a085f57 100644
--- a/ruby/lib/gitaly_server.rb
+++ b/ruby/lib/gitaly_server.rb
@@ -6,7 +6,6 @@ require_relative 'gitlab/git.rb'
 require_relative 'gitaly_server/client.rb'
 require_relative 'gitaly_server/utils.rb'
 require_relative 'gitaly_server/blob_service.rb'
-require_relative 'gitaly_server/ref_service.rb'
 require_relative 'gitaly_server/operations_service.rb'
 require_relative 'gitaly_server/repository_service.rb'
 require_relative 'gitaly_server/wiki_service.rb'
@@ -47,7 +46,6 @@ module GitalyServer
   end
 
   def self.register_handlers(server)
-    server.handle(RefService.new)
     server.handle(OperationsService.new)
     server.handle(RepositoryService.new)
     server.handle(WikiService.new)
diff --git a/ruby/lib/gitaly_server/ref_service.rb b/ruby/lib/gitaly_server/ref_service.rb
deleted file mode 100644
index 2c14b0882..000000000
--- a/ruby/lib/gitaly_server/ref_service.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-module GitalyServer
-  class RefService < Gitaly::RefService::Service
-    include Utils
-
-    TAGS_PER_MESSAGE = 100
-
-    def create_branch(request, call)
-      start_point = request.start_point
-      start_point = 'HEAD' if start_point.empty?
-      branch_name = request.name
-
-      repo = Gitlab::Git::Repository.from_gitaly(request.repository, call)
-      rugged_ref = repo.rugged.branches.create(branch_name, start_point)
-
-      Gitaly::CreateBranchResponse.new(
-        status: :OK,
-        branch: Gitaly::Branch.new(
-          name: rugged_ref.name.b,
-          target_commit: gitaly_commit_from_rugged(rugged_ref.target)
-        )
-      )
-    rescue Rugged::ReferenceError => e
-      status = case e.to_s
-               when /'refs\/heads\/#{branch_name}' is not valid/
-                 :ERR_INVALID
-               when /a reference with that name already exists/
-                 :ERR_EXISTS
-               else
-                 :ERR_INVALID_START_POINT
-               end
-
-      Gitaly::CreateBranchResponse.new(status: status)
-    end
-
-    def delete_branch(request, call)
-      branch_name = request.name
-      raise GRPC::InvalidArgument.new("empty Name") if branch_name.empty?
-
-      repo = Gitlab::Git::Repository.from_gitaly(request.repository, call)
-      repo.delete_branch(branch_name)
-
-      Gitaly::DeleteBranchResponse.new
-    rescue Gitlab::Git::Repository::DeleteBranchError => e
-      raise GRPC::Internal.new(e.to_s)
-    end
-  end
-end
diff --git a/ruby/proto/gitaly/ref_services_pb.rb b/ruby/proto/gitaly/ref_services_pb.rb
index a74ef2d38..8d87890a2 100644
--- a/ruby/proto/gitaly/ref_services_pb.rb
+++ b/ruby/proto/gitaly/ref_services_pb.rb
@@ -26,8 +26,6 @@ module Gitaly
       rpc :FindTag, FindTagRequest, FindTagResponse
       rpc :FindAllRemoteBranches, FindAllRemoteBranchesRequest, stream(FindAllRemoteBranchesResponse)
       rpc :RefExists, RefExistsRequest, RefExistsResponse
-      rpc :CreateBranch, CreateBranchRequest, CreateBranchResponse
-      rpc :DeleteBranch, DeleteBranchRequest, DeleteBranchResponse
       rpc :FindBranch, FindBranchRequest, FindBranchResponse
       rpc :DeleteRefs, DeleteRefsRequest, DeleteRefsResponse
       rpc :ListBranchNamesContainingCommit, ListBranchNamesContainingCommitRequest, stream(ListBranchNamesContainingCommitResponse)
diff --git a/ruby/spec/gitaly/ref_service_spec.rb b/ruby/spec/gitaly/ref_service_spec.rb
deleted file mode 100644
index c3ba9d30c..000000000
--- a/ruby/spec/gitaly/ref_service_spec.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-require 'securerandom'
-require 'spec_helper'
-
-describe Gitaly::RefService do
-  include IntegrationClient
-  include TestRepo
-
-  let(:service_stub) { gitaly_stub(:RefService) }
-
-  describe 'CreateBranch' do
-    it 'can create a branch' do
-      repo = new_mutable_test_repo
-      branch_name = 'branch-' + SecureRandom.hex(10)
-      request = Gitaly::CreateBranchRequest.new(
-        repository: repo,
-        name: branch_name,
-        start_point: 'master'
-      )
-
-      response = service_stub.create_branch(request)
-
-      expect(response.status).to eq(:OK)
-
-      # Intentionally instatiate this Rugged::Repository after we performed
-      # the RPC, to ensure we don't see stale repository state.
-      rugged = rugged_from_gitaly(repo)
-
-      expect(response.branch.target_commit.id).to eq(rugged.branches[branch_name].target_id)
-    end
-  end
-end
diff --git a/ruby/spec/lib/gitaly_server/exception_sanitizer_interceptor_spec.rb b/ruby/spec/lib/gitaly_server/exception_sanitizer_interceptor_spec.rb
index 2e5516173..7e3bc328d 100644
--- a/ruby/spec/lib/gitaly_server/exception_sanitizer_interceptor_spec.rb
+++ b/ruby/spec/lib/gitaly_server/exception_sanitizer_interceptor_spec.rb
@@ -1,8 +1,8 @@
 require 'spec_helper'
-
 require_relative '../../../lib/gitaly_server/exception_sanitizer_interceptor.rb'
+
 describe GitalyServer::ExceptionSanitizerInterceptor do
-  let(:meth) { GitalyServer::RefService.instance_method(:create_branch) }
+  let(:meth) { GitalyServer::OperationsService.instance_method(:user_create_branch) }
   let(:ex) { StandardError.new("error: failed to push some refs to 'https://fO0BA7:HunTer!@github.com/ruby/ruby.git'") }
   let(:ex_sanitized_message) { "error: failed to push some refs to 'https://[FILTERED]@github.com/ruby/ruby.git'" }
   let(:call) { double(metadata: {}) }
diff --git a/ruby/spec/lib/gitaly_server/rugged_interceptor_spec.rb b/ruby/spec/lib/gitaly_server/rugged_interceptor_spec.rb
index 01aab9f94..d6df2f407 100644
--- a/ruby/spec/lib/gitaly_server/rugged_interceptor_spec.rb
+++ b/ruby/spec/lib/gitaly_server/rugged_interceptor_spec.rb
@@ -5,7 +5,7 @@ require_relative '../../../lib/gitaly_server/rugged_interceptor.rb'
 describe GitalyServer::RuggedInterceptor do
   include TestRepo
 
-  let(:meth) { GitalyServer::RefService.instance_method(:create_branch) }
+  let(:meth) { GitalyServer::OperationsService.instance_method(:user_create_branch) }
   let(:call) { double(metadata: {}) }
 
   subject do
diff --git a/ruby/spec/lib/gitaly_server/sentry/url_sanitizer_spec.rb b/ruby/spec/lib/gitaly_server/sentry/url_sanitizer_spec.rb
index c582e7362..858045f31 100644
--- a/ruby/spec/lib/gitaly_server/sentry/url_sanitizer_spec.rb
+++ b/ruby/spec/lib/gitaly_server/sentry/url_sanitizer_spec.rb
@@ -4,7 +4,7 @@ require 'raven/base'
 require 'raven/transports/dummy'
 require_relative '../../../../lib/gitaly_server/sentry.rb'
 describe GitalyServer::Sentry::URLSanitizer do
-  let(:meth) { GitalyServer::RefService.instance_method(:create_branch) }
+  let(:meth) { GitalyServer::OperationsService.instance_method(:user_create_branch) }
   let(:ex) { StandardError.new("error: failed to push some refs to 'https://fO0BA7:HunTer!@github.com/ruby/ruby.git'") }
   let(:ex_sanitized_message) { "error: failed to push some refs to 'https://[FILTERED]@github.com/ruby/ruby.git'" }
   let(:call) { double(metadata: {}) }
diff --git a/ruby/spec/lib/gitaly_server/sentry_interceptor_spec.rb b/ruby/spec/lib/gitaly_server/sentry_interceptor_spec.rb
index 5e48da132..9b4be30b1 100644
--- a/ruby/spec/lib/gitaly_server/sentry_interceptor_spec.rb
+++ b/ruby/spec/lib/gitaly_server/sentry_interceptor_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
 require_relative '../../../lib/gitaly_server/sentry_interceptor.rb'
 describe GitalyServer::SentryInterceptor do
   describe 'handling exceptions' do
-    let(:meth) { GitalyServer::RefService.instance_method(:create_branch) }
+    let(:meth) { GitalyServer::OperationsService.instance_method(:user_create_branch) }
     let(:ex) { ArgumentError.new("unknown encoding") }
     let(:call) { nil }
 
@@ -45,7 +45,7 @@ describe GitalyServer::SentryInterceptor do
       let(:expected_tags) do
         call_metadata.merge(
           'system' => 'gitaly-ruby',
-          'gitaly-ruby.method' => 'GitalyServer::RefService#create_branch'
+          'gitaly-ruby.method' => 'GitalyServer::OperationsService#user_create_branch'
         )
       end
 
@@ -67,7 +67,7 @@ describe GitalyServer::SentryInterceptor do
         it 'sends the exception to Sentry' do
           expect(Raven).to receive(:capture_exception).with(
             ex,
-            fingerprint: ['gitaly-ruby', 'GitalyServer::RefService#create_branch', 'unknown encoding']
+            fingerprint: ['gitaly-ruby', 'GitalyServer::OperationsService#user_create_branch', 'unknown encoding']
           )
 
           begin