Merge branch 'zj-remove-wiki-delete-page' into 'master'

wiki: Remove DeletePage RPC

See merge request gitlab-org/gitaly!3453

12 files changed, 67 insertions, 476 deletions

diff --git a/internal/gitaly/service/wiki/delete_page.go b/internal/gitaly/service/wiki/delete_page.go
deleted file mode 100644
index 77fcd45c6..000000000
--- a/internal/gitaly/service/wiki/delete_page.go
+++ /dev/null
@@ -1,37 +0,0 @@
-package wiki
-
-import (
-	"context"
-	"fmt"
-
-	"gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver"
-	"gitlab.com/gitlab-org/gitaly/proto/go/gitalypb"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
-)
-
-func (s *server) WikiDeletePage(ctx context.Context, request *gitalypb.WikiDeletePageRequest) (*gitalypb.WikiDeletePageResponse, error) {
-	if err := validateWikiDeletePageRequest(request); err != nil {
-		return nil, status.Errorf(codes.InvalidArgument, "WikiDeletePage: %v", err)
-	}
-
-	client, err := s.ruby.WikiServiceClient(ctx)
-	if err != nil {
-		return nil, err
-	}
-
-	clientCtx, err := rubyserver.SetHeaders(ctx, s.locator, request.GetRepository())
-	if err != nil {
-		return nil, err
-	}
-
-	return client.WikiDeletePage(clientCtx, request)
-}
-
-func validateWikiDeletePageRequest(request *gitalypb.WikiDeletePageRequest) error {
-	if len(request.GetPagePath()) == 0 {
-		return fmt.Errorf("empty PagePath")
-	}
-
-	return validateRequestCommitDetails(request)
-}
diff --git a/internal/gitaly/service/wiki/delete_page_test.go b/internal/gitaly/service/wiki/delete_page_test.go
deleted file mode 100644
index 3518e9690..000000000
--- a/internal/gitaly/service/wiki/delete_page_test.go
+++ /dev/null
@@ -1,183 +0,0 @@
-package wiki
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-	"gitlab.com/gitlab-org/gitaly/internal/git"
-	"gitlab.com/gitlab-org/gitaly/internal/git/gittest"
-	"gitlab.com/gitlab-org/gitaly/internal/git/localrepo"
-	"gitlab.com/gitlab-org/gitaly/internal/gitaly/config"
-	"gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver"
-	"gitlab.com/gitlab-org/gitaly/internal/testhelper"
-	"gitlab.com/gitlab-org/gitaly/proto/go/gitalypb"
-	"google.golang.org/grpc/codes"
-)
-
-func testSuccessfulWikiDeletePageRequest(t *testing.T, cfg config.Cfg, rubySrv *rubyserver.Server) {
-	wikiRepoProto, wikiRepoPath, cleanupFunc := setupWikiRepo(t, cfg)
-	defer cleanupFunc()
-
-	wikiRepo := localrepo.NewTestRepo(t, cfg, wikiRepoProto)
-
-	ctx, cancel := testhelper.Context()
-	defer cancel()
-
-	client := setupWikiService(t, cfg, rubySrv)
-
-	pageName := "A talé of two wikis"
-	authorID := int32(1)
-	authorUserName := []byte("ahmad")
-	authorName := []byte("Ahmad Sherif")
-	authorEmail := []byte("ahmad@gitlab.com")
-	message := []byte("Delete " + pageName)
-	content := []byte("It was the best of wikis, it was the worst of wikis")
-
-	testCases := []struct {
-		desc string
-		req  *gitalypb.WikiDeletePageRequest
-	}{
-		{
-			desc: "with user id and username",
-			req: &gitalypb.WikiDeletePageRequest{
-				Repository: wikiRepoProto,
-				PagePath:   []byte("a-talé-of-two-wikis"),
-				CommitDetails: &gitalypb.WikiCommitDetails{
-					Name:     authorName,
-					Email:    authorEmail,
-					Message:  message,
-					UserId:   authorID,
-					UserName: authorUserName,
-				},
-			},
-		},
-		{
-			desc: "without user id and username", // deprecate in GitLab 11.0 https://gitlab.com/gitlab-org/gitaly/issues/1154
-			req: &gitalypb.WikiDeletePageRequest{
-				Repository: wikiRepoProto,
-				PagePath:   []byte("a-talé-of-two-wikis"),
-				CommitDetails: &gitalypb.WikiCommitDetails{
-					Name:    authorName,
-					Email:   authorEmail,
-					Message: message,
-				},
-			},
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.desc, func(t *testing.T) {
-			writeWikiPage(t, client, wikiRepoProto, createWikiPageOpts{title: pageName, content: content})
-
-			_, err := client.WikiDeletePage(ctx, tc.req)
-			require.NoError(t, err)
-
-			headID := gittest.Exec(t, cfg, "-C", wikiRepoPath, "show", "--format=format:%H", "--no-patch", "HEAD")
-			commit, err := wikiRepo.ReadCommit(ctx, git.Revision(headID))
-			require.NoError(t, err, "look up git commit after deleting a wiki page")
-
-			require.Equal(t, authorName, commit.Author.Name, "author name mismatched")
-			require.Equal(t, authorEmail, commit.Author.Email, "author email mismatched")
-			require.Equal(t, message, commit.Subject, "message mismatched")
-		})
-	}
-}
-
-func testFailedWikiDeletePageDueToValidations(t *testing.T, cfg config.Cfg, rubySrv *rubyserver.Server) {
-	wikiRepo, _, cleanupFunc := setupWikiRepo(t, cfg)
-	defer cleanupFunc()
-
-	client := setupWikiService(t, cfg, rubySrv)
-
-	commitDetails := &gitalypb.WikiCommitDetails{
-		Name:     []byte("Ahmad Sherif"),
-		Email:    []byte("ahmad@gitlab.com"),
-		Message:  []byte("Delete a wiki page"),
-		UserId:   int32(1),
-		UserName: []byte("ahmad"),
-	}
-
-	testCases := []struct {
-		desc    string
-		request *gitalypb.WikiDeletePageRequest
-		code    codes.Code
-	}{
-		{
-			desc: "non existent  page path",
-			request: &gitalypb.WikiDeletePageRequest{
-				Repository:    wikiRepo,
-				PagePath:      []byte("does-not-exist"),
-				CommitDetails: commitDetails,
-			},
-			code: codes.NotFound,
-		},
-		{
-			desc: "empty page path",
-			request: &gitalypb.WikiDeletePageRequest{
-				Repository:    wikiRepo,
-				CommitDetails: commitDetails,
-			},
-			code: codes.InvalidArgument,
-		},
-		{
-			desc: "empty commit details",
-			request: &gitalypb.WikiDeletePageRequest{
-				Repository: wikiRepo,
-				PagePath:   []byte("does-not-matter"),
-			},
-			code: codes.InvalidArgument,
-		},
-		{
-			desc: "empty commit details' name",
-			request: &gitalypb.WikiDeletePageRequest{
-				Repository: wikiRepo,
-				PagePath:   []byte("does-not-matter"),
-				CommitDetails: &gitalypb.WikiCommitDetails{
-					Email:    []byte("a@b.com"),
-					Message:  []byte("A message"),
-					UserId:   int32(1),
-					UserName: []byte("username"),
-				},
-			},
-			code: codes.InvalidArgument,
-		},
-		{
-			desc: "empty commit details' email",
-			request: &gitalypb.WikiDeletePageRequest{
-				Repository: wikiRepo,
-				PagePath:   []byte("does-not-matter"),
-				CommitDetails: &gitalypb.WikiCommitDetails{
-					Name:     []byte("A name"),
-					Message:  []byte("A message"),
-					UserId:   int32(1),
-					UserName: []byte("username"),
-				},
-			},
-			code: codes.InvalidArgument,
-		},
-		{
-			desc: "empty commit details' message",
-			request: &gitalypb.WikiDeletePageRequest{
-				Repository: wikiRepo,
-				PagePath:   []byte("does-not-matter"),
-				CommitDetails: &gitalypb.WikiCommitDetails{
-					Name:     []byte("A name"),
-					Email:    []byte("a@b.com"),
-					UserId:   int32(1),
-					UserName: []byte("username"),
-				},
-			},
-			code: codes.InvalidArgument,
-		},
-	}
-
-	for _, testCase := range testCases {
-		t.Run(testCase.desc, func(t *testing.T) {
-			ctx, cancel := testhelper.Context()
-			defer cancel()
-
-			_, err := client.WikiDeletePage(ctx, testCase.request)
-			testhelper.RequireGrpcError(t, err, testCase.code)
-		})
-	}
-}
diff --git a/internal/gitaly/service/wiki/testhelper_test.go b/internal/gitaly/service/wiki/testhelper_test.go
index 11ce4e964..cfd661fb0 100644
--- a/internal/gitaly/service/wiki/testhelper_test.go
+++ b/internal/gitaly/service/wiki/testhelper_test.go
@@ -63,8 +63,6 @@ func TestWithRubySidecar(t *testing.T) {
 	t.Cleanup(rubySrv.Stop)
 
 	fs := []func(t *testing.T, cfg config.Cfg, rubySrv *rubyserver.Server){
-		testSuccessfulWikiDeletePageRequest,
-		testFailedWikiDeletePageDueToValidations,
 		testSuccessfulWikiFindPageRequest,
 		testSuccessfulWikiFindPageSameTitleDifferentPathRequest,
 		testSuccessfulWikiFindPageRequestWithTrailers,
diff --git a/internal/praefect/coordinator.go b/internal/praefect/coordinator.go
index 887116148..5b2cb72fa 100644
--- a/internal/praefect/coordinator.go
+++ b/internal/praefect/coordinator.go
@@ -85,7 +85,6 @@ var transactionRPCs = map[string]transactionsCondition{
 	"/gitaly.RepositoryService/WriteRef":                     transactionsEnabled,
 	"/gitaly.SSHService/SSHReceivePack":                      transactionsEnabled,
 	"/gitaly.SmartHTTPService/PostReceivePack":               transactionsEnabled,
-	"/gitaly.WikiService/WikiDeletePage":                     transactionsEnabled,
 	"/gitaly.WikiService/WikiUpdatePage":                     transactionsEnabled,
 	"/gitaly.WikiService/WikiWritePage":                      transactionsEnabled,
 
diff --git a/internal/praefect/protoregistry/protoregistry_test.go b/internal/praefect/protoregistry/protoregistry_test.go
index 7d5a95033..4a99e31b2 100644
--- a/internal/praefect/protoregistry/protoregistry_test.go
+++ b/internal/praefect/protoregistry/protoregistry_test.go
@@ -160,7 +160,6 @@ func TestNewProtoRegistry(t *testing.T) {
 		"WikiService": map[string]protoregistry.OpType{
 			"WikiWritePage":   protoregistry.OpMutator,
 			"WikiUpdatePage":  protoregistry.OpMutator,
-			"WikiDeletePage":  protoregistry.OpMutator,
 			"WikiFindPage":    protoregistry.OpAccessor,
 			"WikiGetAllPages": protoregistry.OpAccessor,
 			"WikiListPages":   protoregistry.OpAccessor,
diff --git a/proto/go/gitalypb/wiki.pb.go b/proto/go/gitalypb/wiki.pb.go
index fa62071b4..54de0aa20 100644
--- a/proto/go/gitalypb/wiki.pb.go
+++ b/proto/go/gitalypb/wiki.pb.go
@@ -46,7 +46,7 @@ func (x WikiGetAllPagesRequest_SortBy) String() string {
 }
 
 func (WikiGetAllPagesRequest_SortBy) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_5c56f90469cec0af, []int{11, 0}
+	return fileDescriptor_5c56f90469cec0af, []int{9, 0}
 }
 
 type WikiListPagesRequest_SortBy int32
@@ -71,7 +71,7 @@ func (x WikiListPagesRequest_SortBy) String() string {
 }
 
 func (WikiListPagesRequest_SortBy) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_5c56f90469cec0af, []int{13, 0}
+	return fileDescriptor_5c56f90469cec0af, []int{11, 0}
 }
 
 type WikiCommitDetails struct {
@@ -522,92 +522,6 @@ func (m *WikiUpdatePageResponse) GetError() []byte {
 	return nil
 }
 
-type WikiDeletePageRequest struct {
-	Repository           *Repository        `protobuf:"bytes,1,opt,name=repository,proto3" json:"repository,omitempty"`
-	PagePath             []byte             `protobuf:"bytes,2,opt,name=page_path,json=pagePath,proto3" json:"page_path,omitempty"`
-	CommitDetails        *WikiCommitDetails `protobuf:"bytes,3,opt,name=commit_details,json=commitDetails,proto3" json:"commit_details,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
-	XXX_unrecognized     []byte             `json:"-"`
-	XXX_sizecache        int32              `json:"-"`
-}
-
-func (m *WikiDeletePageRequest) Reset()         { *m = WikiDeletePageRequest{} }
-func (m *WikiDeletePageRequest) String() string { return proto.CompactTextString(m) }
-func (*WikiDeletePageRequest) ProtoMessage()    {}
-func (*WikiDeletePageRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_5c56f90469cec0af, []int{7}
-}
-
-func (m *WikiDeletePageRequest) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_WikiDeletePageRequest.Unmarshal(m, b)
-}
-func (m *WikiDeletePageRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_WikiDeletePageRequest.Marshal(b, m, deterministic)
-}
-func (m *WikiDeletePageRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WikiDeletePageRequest.Merge(m, src)
-}
-func (m *WikiDeletePageRequest) XXX_Size() int {
-	return xxx_messageInfo_WikiDeletePageRequest.Size(m)
-}
-func (m *WikiDeletePageRequest) XXX_DiscardUnknown() {
-	xxx_messageInfo_WikiDeletePageRequest.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_WikiDeletePageRequest proto.InternalMessageInfo
-
-func (m *WikiDeletePageRequest) GetRepository() *Repository {
-	if m != nil {
-		return m.Repository
-	}
-	return nil
-}
-
-func (m *WikiDeletePageRequest) GetPagePath() []byte {
-	if m != nil {
-		return m.PagePath
-	}
-	return nil
-}
-
-func (m *WikiDeletePageRequest) GetCommitDetails() *WikiCommitDetails {
-	if m != nil {
-		return m.CommitDetails
-	}
-	return nil
-}
-
-type WikiDeletePageResponse struct {
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
-}
-
-func (m *WikiDeletePageResponse) Reset()         { *m = WikiDeletePageResponse{} }
-func (m *WikiDeletePageResponse) String() string { return proto.CompactTextString(m) }
-func (*WikiDeletePageResponse) ProtoMessage()    {}
-func (*WikiDeletePageResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_5c56f90469cec0af, []int{8}
-}
-
-func (m *WikiDeletePageResponse) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_WikiDeletePageResponse.Unmarshal(m, b)
-}
-func (m *WikiDeletePageResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_WikiDeletePageResponse.Marshal(b, m, deterministic)
-}
-func (m *WikiDeletePageResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WikiDeletePageResponse.Merge(m, src)
-}
-func (m *WikiDeletePageResponse) XXX_Size() int {
-	return xxx_messageInfo_WikiDeletePageResponse.Size(m)
-}
-func (m *WikiDeletePageResponse) XXX_DiscardUnknown() {
-	xxx_messageInfo_WikiDeletePageResponse.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_WikiDeletePageResponse proto.InternalMessageInfo
-
 type WikiFindPageRequest struct {
 	Repository           *Repository `protobuf:"bytes,1,opt,name=repository,proto3" json:"repository,omitempty"`
 	Title                []byte      `protobuf:"bytes,2,opt,name=title,proto3" json:"title,omitempty"`
@@ -622,7 +536,7 @@ func (m *WikiFindPageRequest) Reset()         { *m = WikiFindPageRequest{} }
 func (m *WikiFindPageRequest) String() string { return proto.CompactTextString(m) }
 func (*WikiFindPageRequest) ProtoMessage()    {}
 func (*WikiFindPageRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_5c56f90469cec0af, []int{9}
+	return fileDescriptor_5c56f90469cec0af, []int{7}
 }
 
 func (m *WikiFindPageRequest) XXX_Unmarshal(b []byte) error {
@@ -684,7 +598,7 @@ func (m *WikiFindPageResponse) Reset()         { *m = WikiFindPageResponse{} }
 func (m *WikiFindPageResponse) String() string { return proto.CompactTextString(m) }
 func (*WikiFindPageResponse) ProtoMessage()    {}
 func (*WikiFindPageResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_5c56f90469cec0af, []int{10}
+	return fileDescriptor_5c56f90469cec0af, []int{8}
 }
 
 func (m *WikiFindPageResponse) XXX_Unmarshal(b []byte) error {
@@ -727,7 +641,7 @@ func (m *WikiGetAllPagesRequest) Reset()         { *m = WikiGetAllPagesRequest{}
 func (m *WikiGetAllPagesRequest) String() string { return proto.CompactTextString(m) }
 func (*WikiGetAllPagesRequest) ProtoMessage()    {}
 func (*WikiGetAllPagesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_5c56f90469cec0af, []int{11}
+	return fileDescriptor_5c56f90469cec0af, []int{9}
 }
 
 func (m *WikiGetAllPagesRequest) XXX_Unmarshal(b []byte) error {
@@ -790,7 +704,7 @@ func (m *WikiGetAllPagesResponse) Reset()         { *m = WikiGetAllPagesResponse
 func (m *WikiGetAllPagesResponse) String() string { return proto.CompactTextString(m) }
 func (*WikiGetAllPagesResponse) ProtoMessage()    {}
 func (*WikiGetAllPagesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_5c56f90469cec0af, []int{12}
+	return fileDescriptor_5c56f90469cec0af, []int{10}
 }
 
 func (m *WikiGetAllPagesResponse) XXX_Unmarshal(b []byte) error {
@@ -841,7 +755,7 @@ func (m *WikiListPagesRequest) Reset()         { *m = WikiListPagesRequest{} }
 func (m *WikiListPagesRequest) String() string { return proto.CompactTextString(m) }
 func (*WikiListPagesRequest) ProtoMessage()    {}
 func (*WikiListPagesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_5c56f90469cec0af, []int{13}
+	return fileDescriptor_5c56f90469cec0af, []int{11}
 }
 
 func (m *WikiListPagesRequest) XXX_Unmarshal(b []byte) error {
@@ -909,7 +823,7 @@ func (m *WikiListPagesResponse) Reset()         { *m = WikiListPagesResponse{} }
 func (m *WikiListPagesResponse) String() string { return proto.CompactTextString(m) }
 func (*WikiListPagesResponse) ProtoMessage()    {}
 func (*WikiListPagesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_5c56f90469cec0af, []int{14}
+	return fileDescriptor_5c56f90469cec0af, []int{12}
 }
 
 func (m *WikiListPagesResponse) XXX_Unmarshal(b []byte) error {
@@ -947,8 +861,6 @@ func init() {
 	proto.RegisterType((*WikiWritePageResponse)(nil), "gitaly.WikiWritePageResponse")
 	proto.RegisterType((*WikiUpdatePageRequest)(nil), "gitaly.WikiUpdatePageRequest")
 	proto.RegisterType((*WikiUpdatePageResponse)(nil), "gitaly.WikiUpdatePageResponse")
-	proto.RegisterType((*WikiDeletePageRequest)(nil), "gitaly.WikiDeletePageRequest")
-	proto.RegisterType((*WikiDeletePageResponse)(nil), "gitaly.WikiDeletePageResponse")
 	proto.RegisterType((*WikiFindPageRequest)(nil), "gitaly.WikiFindPageRequest")
 	proto.RegisterType((*WikiFindPageResponse)(nil), "gitaly.WikiFindPageResponse")
 	proto.RegisterType((*WikiGetAllPagesRequest)(nil), "gitaly.WikiGetAllPagesRequest")
@@ -960,66 +872,64 @@ func init() {
 func init() { proto.RegisterFile("wiki.proto", fileDescriptor_5c56f90469cec0af) }
 
 var fileDescriptor_5c56f90469cec0af = []byte{
-	// 941 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x56, 0x4f, 0x6f, 0x1b, 0x45,
-	0x14, 0x67, 0x1d, 0x7b, 0xbd, 0x7e, 0x89, 0xdd, 0x74, 0x28, 0xcd, 0xd6, 0x09, 0x21, 0xda, 0x52,
-	0x61, 0x24, 0x70, 0x4a, 0x38, 0x00, 0x12, 0x48, 0x4d, 0xea, 0x50, 0x55, 0xaa, 0xa0, 0x9a, 0x98,
-	0x46, 0x20, 0xa4, 0xd5, 0x64, 0x77, 0xec, 0x8c, 0xb2, 0xde, 0x31, 0x33, 0xe3, 0x44, 0x39, 0x73,
-	0xe6, 0x0c, 0x37, 0x2e, 0x7c, 0x00, 0x3e, 0x05, 0x9f, 0x81, 0xaf, 0xc0, 0x89, 0x2b, 0xe2, 0x84,
-	0x66, 0x66, 0x6d, 0xef, 0x7a, 0x63, 0x20, 0x28, 0x42, 0xbd, 0xed, 0x7b, 0x6f, 0xe6, 0x37, 0xef,
-	0xf7, 0x7b, 0x7f, 0x6c, 0x80, 0x0b, 0x76, 0xc6, 0xba, 0x63, 0xc1, 0x15, 0x47, 0xee, 0x90, 0x29,
-	0x92, 0x5c, 0xb6, 0x21, 0x61, 0xa9, 0xb2, 0xbe, 0xf6, 0x9a, 0x3c, 0x25, 0x82, 0xc6, 0xd6, 0x0a,
-	0xbe, 0x73, 0xe0, 0xf6, 0x31, 0x3b, 0x63, 0x8f, 0xf9, 0x68, 0xc4, 0x54, 0x8f, 0x2a, 0xc2, 0x12,
-	0x89, 0x10, 0x54, 0x53, 0x32, 0xa2, 0xbe, 0xb3, 0xe3, 0x74, 0xd6, 0xb0, 0xf9, 0x46, 0x77, 0xa0,
-	0x46, 0x47, 0x84, 0x25, 0x7e, 0xc5, 0x38, 0xad, 0x81, 0x7c, 0xa8, 0x8f, 0xa8, 0x94, 0x64, 0x48,
-	0xfd, 0x15, 0xe3, 0x9f, 0x9a, 0x68, 0x03, 0xea, 0x13, 0x49, 0x45, 0xc8, 0x62, 0xbf, 0xba, 0xe3,
-	0x74, 0x6a, 0xd8, 0xd5, 0xe6, 0xd3, 0x18, 0x6d, 0x42, 0xc3, 0x04, 0xcc, 0x0b, 0x35, 0x73, 0xc9,
-	0xd3, 0x8e, 0xcf, 0xc8, 0x88, 0x06, 0x7d, 0xb8, 0xa5, 0xd3, 0x79, 0x4e, 0x86, 0xf4, 0x05, 0x15,
-	0x92, 0xf1, 0x14, 0xbd, 0x0d, 0x6e, 0x64, 0xb2, 0x33, 0xe9, 0xac, 0xee, 0xdd, 0xee, 0x5a, 0x56,
-	0xdd, 0x27, 0x4c, 0xd9, 0xb4, 0x71, 0x76, 0x00, 0xdd, 0x05, 0x77, 0xc0, 0xc5, 0x88, 0x28, 0x93,
-	0x64, 0x03, 0x67, 0x56, 0xf0, 0x9b, 0x03, 0xde, 0x14, 0x16, 0xbd, 0x07, 0xf5, 0x73, 0x0b, 0x9d,
-	0x01, 0x6e, 0x4c, 0x01, 0x17, 0x5e, 0xc6, 0xd3, 0x73, 0xcb, 0x70, 0xb5, 0x26, 0x8a, 0xa9, 0x64,
-	0xca, 0xdd, 0x1a, 0xe8, 0x1e, 0x78, 0x13, 0x91, 0x84, 0x63, 0xa2, 0x4e, 0x0d, 0xf5, 0x06, 0xae,
-	0x4f, 0x44, 0xf2, 0x9c, 0xa8, 0x53, 0x2d, 0xac, 0x71, 0x5b, 0xda, 0xe6, 0x7b, 0x26, 0xb6, 0x9b,
-	0x13, 0x7b, 0x1b, 0xe0, 0x94, 0x49, 0xc5, 0x05, 0x8b, 0x48, 0xe2, 0xd7, 0x77, 0x9c, 0x8e, 0x87,
-	0x73, 0x1e, 0xfd, 0x84, 0x20, 0x17, 0x61, 0x4c, 0x14, 0xf1, 0x3d, 0xab, 0xbb, 0x20, 0x17, 0x3d,
-	0xa2, 0x48, 0xf0, 0xab, 0x03, 0x77, 0x34, 0x91, 0x63, 0xc1, 0x14, 0xd5, 0x6c, 0x30, 0xfd, 0x66,
-	0x42, 0xa5, 0x42, 0x1f, 0x02, 0x08, 0x3a, 0xe6, 0x92, 0x29, 0x2e, 0x2e, 0x33, 0xea, 0x68, 0x4a,
-	0x1d, 0xcf, 0x22, 0x07, 0xd5, 0x1f, 0x7e, 0x79, 0xc7, 0xc1, 0xb9, 0xb3, 0xb3, 0x0c, 0x2b, 0xb9,
-	0x0c, 0xe7, 0x92, 0xac, 0x14, 0x24, 0x79, 0x04, 0x2d, 0x5b, 0x8c, 0x30, 0xb6, 0xcd, 0x64, 0x24,
-	0x58, 0xdd, 0xbb, 0x97, 0x17, 0xb9, 0xd0, 0x6d, 0xb8, 0x19, 0x15, 0x9a, 0xcf, 0x87, 0x7a, 0xc4,
-	0x53, 0x45, 0x53, 0x95, 0xc9, 0x34, 0x35, 0x83, 0x47, 0xf0, 0xda, 0x02, 0x33, 0x39, 0xe6, 0xa9,
-	0xa4, 0xe8, 0x2d, 0xb8, 0x15, 0x4f, 0xc6, 0x09, 0x8b, 0x88, 0xa2, 0x21, 0x15, 0x82, 0x8b, 0xac,
-	0x75, 0x5b, 0x33, 0xf7, 0xa1, 0xf6, 0x06, 0x7f, 0x38, 0x16, 0xe2, 0x8b, 0x71, 0x4c, 0x6e, 0x4a,
-	0x9d, 0x4d, 0x68, 0x8c, 0xc9, 0x90, 0xda, 0x7a, 0x5b, 0x89, 0x3c, 0xed, 0x30, 0x05, 0xbf, 0xba,
-	0x43, 0xe6, 0xe2, 0x55, 0xff, 0x41, 0xbc, 0xda, 0x7f, 0x17, 0xcf, 0x2d, 0x8a, 0xd7, 0x85, 0xbb,
-	0x8b, 0xcc, 0x33, 0xf5, 0xf4, 0x64, 0xe7, 0x34, 0xb3, 0x46, 0xf0, 0x73, 0x26, 0x55, 0x8f, 0x26,
-	0xf4, 0x7f, 0x91, 0xaa, 0x4c, 0x7e, 0xe5, 0x7a, 0xe4, 0x03, 0xdf, 0x52, 0xcc, 0x67, 0x6c, 0x29,
-	0x06, 0x3f, 0x3a, 0xf0, 0xaa, 0x0e, 0x7d, 0xca, 0xd2, 0xf8, 0x66, 0xa8, 0xcc, 0x0a, 0x5b, 0xc9,
-	0x17, 0xb6, 0x0d, 0x9e, 0xa0, 0xe7, 0xcc, 0x2c, 0x17, 0x5b, 0xf1, 0x99, 0x8d, 0xb6, 0xa0, 0x11,
-	0x33, 0x41, 0x23, 0xf3, 0x54, 0xd5, 0x04, 0xe7, 0x8e, 0xe0, 0x63, 0x3b, 0xb5, 0xf3, 0x04, 0xb3,
-	0xe2, 0xbc, 0xa9, 0x37, 0xc6, 0x90, 0x66, 0xb9, 0xad, 0x2f, 0xae, 0x2a, 0x6c, 0xa2, 0xc1, 0xef,
-	0x8e, 0xa5, 0xfe, 0x84, 0xaa, 0xfd, 0x24, 0xd1, 0x01, 0x79, 0x23, 0x14, 0x13, 0xa6, 0xf7, 0xae,
-	0xa6, 0xd8, 0xc4, 0xd6, 0x40, 0x0f, 0xa0, 0x65, 0xb3, 0x66, 0x3c, 0x0d, 0x63, 0x2a, 0x23, 0x43,
-	0xd4, 0xc3, 0xcd, 0x99, 0xb7, 0x47, 0x65, 0x84, 0x3e, 0x82, 0xaa, 0xe4, 0xc2, 0x36, 0x78, 0x6b,
-	0xef, 0x41, 0x3e, 0xef, 0x72, 0x92, 0xdd, 0x23, 0x2e, 0xd4, 0xc1, 0x25, 0x36, 0x57, 0x82, 0xfb,
-	0xe0, 0x5a, 0x1b, 0x35, 0xa0, 0xd6, 0x7f, 0xda, 0x7f, 0x76, 0xb8, 0xfe, 0x0a, 0x6a, 0x01, 0x3c,
-	0xc6, 0x87, 0xfb, 0xfd, 0xc3, 0x5e, 0xb8, 0xdf, 0x5f, 0x77, 0x82, 0x10, 0x36, 0x4a, 0x58, 0xd7,
-	0x91, 0x0c, 0x6d, 0xc3, 0x2a, 0x4d, 0xe3, 0x90, 0x0f, 0x42, 0x73, 0xb8, 0x62, 0x48, 0x34, 0x68,
-	0x1a, 0x7f, 0x3e, 0xd0, 0xa7, 0x82, 0x6f, 0x2b, 0xb6, 0x22, 0xcf, 0x98, 0x54, 0x2f, 0x83, 0xa0,
-	0x1f, 0x14, 0x04, 0xbd, 0x9f, 0x67, 0xb5, 0x98, 0x62, 0x41, 0x4e, 0xbd, 0x6c, 0xf8, 0x60, 0x20,
-	0xa9, 0x5d, 0xa7, 0x4d, 0x9c, 0x59, 0xff, 0x4e, 0xe6, 0x4f, 0xec, 0x12, 0xc8, 0xbd, 0x70, 0x1d,
-	0x91, 0xf7, 0x7e, 0xaa, 0xc2, 0xaa, 0x76, 0x1d, 0x51, 0x71, 0xce, 0x22, 0x8a, 0x5e, 0x40, 0xb3,
-	0xb0, 0xc1, 0xd1, 0x56, 0xfe, 0xe2, 0xe2, 0x4f, 0x56, 0xfb, 0xf5, 0x25, 0xd1, 0x6c, 0xaa, 0xdd,
-	0x3f, 0xbf, 0xef, 0x54, 0x3c, 0xa7, 0xe3, 0xa0, 0x2f, 0xa1, 0x55, 0x5c, 0x6e, 0xa8, 0x70, 0xb5,
-	0xb4, 0xee, 0xdb, 0xdb, 0xcb, 0xc2, 0x25, 0xe8, 0x63, 0x0b, 0x3d, 0x5f, 0x2a, 0x45, 0xe8, 0xd2,
-	0x7a, 0x2c, 0x42, 0x5f, 0xb1, 0x8b, 0x32, 0x68, 0x74, 0x04, 0x6b, 0xf9, 0x89, 0x47, 0x9b, 0xf9,
-	0x7b, 0x0b, 0x8b, 0xaa, 0xbd, 0x75, 0x75, 0xb0, 0x00, 0x59, 0x79, 0xe8, 0xa0, 0xaf, 0xed, 0xff,
-	0xa7, 0xdc, 0x58, 0xa0, 0xed, 0xbf, 0x9f, 0xbd, 0xf6, 0x1b, 0x4b, 0xe3, 0x25, 0xf4, 0xac, 0x7c,
-	0xb3, 0x6e, 0x28, 0x96, 0x6f, 0xb1, 0x0d, 0x8b, 0xe5, 0x2b, 0xb5, 0xd0, 0x1c, 0xf7, 0xe0, 0xe1,
-	0x57, 0xfa, 0x64, 0x42, 0x4e, 0xba, 0x11, 0x1f, 0xed, 0xda, 0xcf, 0x77, 0xb9, 0x18, 0xee, 0xda,
-	0xfb, 0xbb, 0xe6, 0xbf, 0xea, 0xee, 0x90, 0x67, 0xf6, 0xf8, 0xe4, 0xc4, 0x35, 0xae, 0xf7, 0xff,
-	0x0a, 0x00, 0x00, 0xff, 0xff, 0x96, 0xc5, 0xef, 0x98, 0xee, 0x0a, 0x00, 0x00,
+	// 899 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x96, 0x41, 0x6f, 0x1b, 0x45,
+	0x14, 0xc7, 0x59, 0xc7, 0x5e, 0xaf, 0x5f, 0x62, 0x37, 0x1d, 0x4a, 0xe3, 0x3a, 0x21, 0x44, 0x5b,
+	0x2a, 0x8c, 0x04, 0x4e, 0x09, 0x07, 0x40, 0x02, 0xa9, 0x49, 0x13, 0xaa, 0x4a, 0x15, 0x54, 0x13,
+	0xd3, 0x0a, 0x84, 0xb4, 0x9a, 0xec, 0x8e, 0x9d, 0x51, 0x77, 0x77, 0x96, 0x99, 0x71, 0xa2, 0x9c,
+	0x39, 0x73, 0x86, 0x1b, 0xdf, 0x86, 0x0b, 0x5f, 0x80, 0xaf, 0xc0, 0x89, 0x2b, 0xe2, 0x84, 0x66,
+	0x66, 0xbd, 0xde, 0x5d, 0x37, 0x40, 0x50, 0x0e, 0xbd, 0xed, 0x7b, 0x6f, 0xe6, 0xcd, 0xfb, 0xff,
+	0xe6, 0xcd, 0xd3, 0x02, 0x9c, 0xb3, 0x17, 0x6c, 0x94, 0x09, 0xae, 0x38, 0x72, 0xa7, 0x4c, 0x91,
+	0xf8, 0x62, 0x00, 0x31, 0x4b, 0x95, 0xf5, 0x0d, 0xd6, 0xe4, 0x29, 0x11, 0x34, 0xb2, 0x96, 0xff,
+	0x83, 0x03, 0x37, 0x9f, 0xb3, 0x17, 0xec, 0x21, 0x4f, 0x12, 0xa6, 0x0e, 0xa9, 0x22, 0x2c, 0x96,
+	0x08, 0x41, 0x33, 0x25, 0x09, 0xed, 0x3b, 0x3b, 0xce, 0x70, 0x0d, 0x9b, 0x6f, 0x74, 0x0b, 0x5a,
+	0x34, 0x21, 0x2c, 0xee, 0x37, 0x8c, 0xd3, 0x1a, 0xa8, 0x0f, 0xed, 0x84, 0x4a, 0x49, 0xa6, 0xb4,
+	0xbf, 0x62, 0xfc, 0x73, 0x13, 0x6d, 0x40, 0x7b, 0x26, 0xa9, 0x08, 0x58, 0xd4, 0x6f, 0xee, 0x38,
+	0xc3, 0x16, 0x76, 0xb5, 0xf9, 0x38, 0x42, 0x9b, 0xd0, 0x31, 0x01, 0x73, 0x42, 0xcb, 0x6c, 0xf2,
+	0xb4, 0xe3, 0x0b, 0x92, 0x50, 0x7f, 0x0c, 0x37, 0x74, 0x39, 0x4f, 0xc9, 0x94, 0x3e, 0xa3, 0x42,
+	0x32, 0x9e, 0xa2, 0x77, 0xc1, 0x0d, 0x4d, 0x75, 0xa6, 0x9c, 0xd5, 0xbd, 0x9b, 0x23, 0xab, 0x6a,
+	0xf4, 0x88, 0x29, 0x5b, 0x36, 0xce, 0x17, 0xa0, 0xdb, 0xe0, 0x4e, 0xb8, 0x48, 0x88, 0x32, 0x45,
+	0x76, 0x70, 0x6e, 0xf9, 0xbf, 0x3b, 0xe0, 0xcd, 0xd3, 0xa2, 0x0f, 0xa0, 0x7d, 0x66, 0x53, 0xe7,
+	0x09, 0x37, 0xe6, 0x09, 0x6b, 0x27, 0xe3, 0xf9, 0xba, 0xcb, 0xf2, 0x6a, 0x26, 0x8a, 0xa9, 0x78,
+	0xae, 0xdd, 0x1a, 0xe8, 0x0e, 0x78, 0x33, 0x11, 0x07, 0x19, 0x51, 0xa7, 0x46, 0x7a, 0x07, 0xb7,
+	0x67, 0x22, 0x7e, 0x4a, 0xd4, 0xa9, 0x06, 0x6b, 0xdc, 0x56, 0xb6, 0xf9, 0x2e, 0x60, 0xbb, 0x25,
+	0xd8, 0xdb, 0x00, 0xa7, 0x4c, 0x2a, 0x2e, 0x58, 0x48, 0xe2, 0x7e, 0x7b, 0xc7, 0x19, 0x7a, 0xb8,
+	0xe4, 0xd1, 0x47, 0x08, 0x72, 0x1e, 0x44, 0x44, 0x91, 0xbe, 0x67, 0xb9, 0x0b, 0x72, 0x7e, 0x48,
+	0x14, 0xf1, 0x7f, 0x73, 0xe0, 0x96, 0x16, 0xf2, 0x5c, 0x30, 0x45, 0xb5, 0x1a, 0x4c, 0xbf, 0x9b,
+	0x51, 0xa9, 0xd0, 0xc7, 0x00, 0x82, 0x66, 0x5c, 0x32, 0xc5, 0xc5, 0x45, 0x2e, 0x1d, 0xcd, 0xa5,
+	0xe3, 0x22, 0x72, 0xd0, 0xfc, 0xe9, 0x97, 0xf7, 0x1c, 0x5c, 0x5a, 0x5b, 0x54, 0xd8, 0x28, 0x55,
+	0xb8, 0x40, 0xb2, 0x52, 0x41, 0xf2, 0x00, 0x7a, 0xf6, 0x32, 0x82, 0xc8, 0x36, 0x93, 0x41, 0xb0,
+	0xba, 0x77, 0xa7, 0x0c, 0xb9, 0xd2, 0x6d, 0xb8, 0x1b, 0x56, 0x9a, 0xaf, 0x0f, 0xed, 0x90, 0xa7,
+	0x8a, 0xa6, 0x2a, 0xc7, 0x34, 0x37, 0xfd, 0x07, 0xf0, 0x46, 0x4d, 0x99, 0xcc, 0x78, 0x2a, 0x29,
+	0x7a, 0x07, 0x6e, 0x44, 0xb3, 0x2c, 0x66, 0x21, 0x51, 0x34, 0xa0, 0x42, 0x70, 0x91, 0xb7, 0x6e,
+	0xaf, 0x70, 0x1f, 0x69, 0xaf, 0xff, 0xa7, 0x63, 0x53, 0x7c, 0x95, 0x45, 0xe4, 0xba, 0xe8, 0x6c,
+	0x42, 0x27, 0x23, 0x53, 0x6a, 0xef, 0xdb, 0x22, 0xf2, 0xb4, 0xc3, 0x5c, 0xf8, 0xcb, 0x3b, 0x64,
+	0x01, 0xaf, 0xf9, 0x2f, 0xf0, 0x5a, 0xff, 0x1f, 0x9e, 0x5b, 0x85, 0x37, 0x82, 0xdb, 0x75, 0xe5,
+	0x39, 0x3d, 0xfd, 0xb2, 0x4b, 0xcc, 0xac, 0xe1, 0xff, 0xec, 0xc0, 0xeb, 0x7a, 0xc3, 0xe7, 0x2c,
+	0x8d, 0xae, 0x07, 0x54, 0xc1, 0xa2, 0x51, 0x66, 0x31, 0x00, 0x4f, 0xd0, 0x33, 0x66, 0xde, 0xa3,
+	0x85, 0x54, 0xd8, 0x68, 0x0b, 0x3a, 0x11, 0x13, 0x34, 0x34, 0x47, 0x35, 0x4d, 0x70, 0xe1, 0xf0,
+	0x3f, 0xb5, 0x8d, 0xbe, 0x28, 0x30, 0xd7, 0xf3, 0xb6, 0x7e, 0x64, 0x53, 0x9a, 0xd7, 0xb6, 0x5e,
+	0x7f, 0xdd, 0xd8, 0x44, 0xfd, 0x3f, 0x1c, 0x0b, 0xe4, 0x11, 0x55, 0xfb, 0x71, 0xac, 0x03, 0xf2,
+	0x5a, 0x24, 0xc6, 0x4c, 0x8f, 0x2a, 0x2d, 0xb1, 0x8b, 0xad, 0x81, 0xee, 0x41, 0xcf, 0x56, 0xcd,
+	0x78, 0x1a, 0x44, 0x54, 0x86, 0x46, 0xa8, 0x87, 0xbb, 0x85, 0xf7, 0x90, 0xca, 0x10, 0x7d, 0x02,
+	0x4d, 0xc9, 0x85, 0xed, 0x89, 0xde, 0xde, 0xbd, 0x72, 0xdd, 0xcb, 0x45, 0x8e, 0x8e, 0xb9, 0x50,
+	0x07, 0x17, 0xd8, 0x6c, 0xf1, 0xef, 0x82, 0x6b, 0x6d, 0xd4, 0x81, 0xd6, 0xf8, 0xf1, 0xf8, 0xc9,
+	0xd1, 0xfa, 0x6b, 0xa8, 0x07, 0xf0, 0x10, 0x1f, 0xed, 0x8f, 0x8f, 0x0e, 0x83, 0xfd, 0xf1, 0xba,
+	0xe3, 0x07, 0xb0, 0xb1, 0x94, 0xeb, 0x2a, 0xc8, 0xd0, 0x36, 0xac, 0xd2, 0x34, 0x0a, 0xf8, 0x24,
+	0x30, 0x8b, 0x1b, 0x46, 0x44, 0x87, 0xa6, 0xd1, 0x97, 0x13, 0xbd, 0xca, 0xff, 0xbe, 0x61, 0x6f,
+	0xe4, 0x09, 0x93, 0xea, 0x55, 0x00, 0xfa, 0x51, 0x05, 0xe8, 0xdd, 0xb2, 0xaa, 0x7a, 0x89, 0x15,
+	0x9c, 0xfa, 0x7d, 0xf2, 0xc9, 0x44, 0x52, 0x3b, 0x81, 0xba, 0x38, 0xb7, 0xfe, 0x1b, 0xe6, 0xcf,
+	0xec, 0x88, 0x29, 0x9d, 0x70, 0x15, 0xc8, 0x7b, 0xbf, 0xae, 0xc0, 0xaa, 0x76, 0x1d, 0x53, 0x71,
+	0xc6, 0x42, 0x8a, 0x9e, 0x41, 0xb7, 0x32, 0xf4, 0xd0, 0x56, 0x79, 0x63, 0x7d, 0xca, 0x0f, 0xde,
+	0xbc, 0x24, 0x6a, 0x6b, 0xf0, 0xdd, 0xbf, 0x7e, 0x1c, 0x36, 0x3c, 0x67, 0xe8, 0xa0, 0xaf, 0xa1,
+	0x57, 0x9d, 0x07, 0xa8, 0xb2, 0x75, 0x69, 0x42, 0x0e, 0xb6, 0x2f, 0x0b, 0x2f, 0xa5, 0x3e, 0x86,
+	0xb5, 0xf2, 0xc3, 0x44, 0x9b, 0xe5, 0x9d, 0xb5, 0x79, 0x32, 0xd8, 0x7a, 0x79, 0xb0, 0x92, 0xb4,
+	0x71, 0xdf, 0x41, 0xdf, 0xda, 0x3f, 0x83, 0x52, 0xf7, 0xa2, 0xed, 0x7f, 0x7e, 0x22, 0x83, 0xb7,
+	0x2e, 0x8d, 0x2f, 0x65, 0xcf, 0x29, 0x17, 0x97, 0x56, 0xa5, 0x5c, 0xef, 0x96, 0x2a, 0xe5, 0xa5,
+	0x9b, 0x5e, 0xe4, 0x3d, 0xb8, 0xff, 0x8d, 0x5e, 0x19, 0x93, 0x93, 0x51, 0xc8, 0x93, 0x5d, 0xfb,
+	0xf9, 0x3e, 0x17, 0xd3, 0x5d, 0xbb, 0x7f, 0xd7, 0xfc, 0x85, 0xed, 0x4e, 0x79, 0x6e, 0x67, 0x27,
+	0x27, 0xae, 0x71, 0x7d, 0xf8, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0x42, 0xd8, 0x3b, 0xbe, 0xc8,
+	0x09, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -1036,7 +946,6 @@ const _ = grpc.SupportPackageIsVersion4
 type WikiServiceClient interface {
 	WikiWritePage(ctx context.Context, opts ...grpc.CallOption) (WikiService_WikiWritePageClient, error)
 	WikiUpdatePage(ctx context.Context, opts ...grpc.CallOption) (WikiService_WikiUpdatePageClient, error)
-	WikiDeletePage(ctx context.Context, in *WikiDeletePageRequest, opts ...grpc.CallOption) (*WikiDeletePageResponse, error)
 	// WikiFindPage returns a stream because the page's raw_data field may be arbitrarily large.
 	WikiFindPage(ctx context.Context, in *WikiFindPageRequest, opts ...grpc.CallOption) (WikiService_WikiFindPageClient, error)
 	WikiGetAllPages(ctx context.Context, in *WikiGetAllPagesRequest, opts ...grpc.CallOption) (WikiService_WikiGetAllPagesClient, error)
@@ -1119,15 +1028,6 @@ func (x *wikiServiceWikiUpdatePageClient) CloseAndRecv() (*WikiUpdatePageRespons
 	return m, nil
 }
 
-func (c *wikiServiceClient) WikiDeletePage(ctx context.Context, in *WikiDeletePageRequest, opts ...grpc.CallOption) (*WikiDeletePageResponse, error) {
-	out := new(WikiDeletePageResponse)
-	err := c.cc.Invoke(ctx, "/gitaly.WikiService/WikiDeletePage", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
 func (c *wikiServiceClient) WikiFindPage(ctx context.Context, in *WikiFindPageRequest, opts ...grpc.CallOption) (WikiService_WikiFindPageClient, error) {
 	stream, err := c.cc.NewStream(ctx, &_WikiService_serviceDesc.Streams[2], "/gitaly.WikiService/WikiFindPage", opts...)
 	if err != nil {
@@ -1228,7 +1128,6 @@ func (x *wikiServiceWikiListPagesClient) Recv() (*WikiListPagesResponse, error)
 type WikiServiceServer interface {
 	WikiWritePage(WikiService_WikiWritePageServer) error
 	WikiUpdatePage(WikiService_WikiUpdatePageServer) error
-	WikiDeletePage(context.Context, *WikiDeletePageRequest) (*WikiDeletePageResponse, error)
 	// WikiFindPage returns a stream because the page's raw_data field may be arbitrarily large.
 	WikiFindPage(*WikiFindPageRequest, WikiService_WikiFindPageServer) error
 	WikiGetAllPages(*WikiGetAllPagesRequest, WikiService_WikiGetAllPagesServer) error
@@ -1245,9 +1144,6 @@ func (*UnimplementedWikiServiceServer) WikiWritePage(srv WikiService_WikiWritePa
 func (*UnimplementedWikiServiceServer) WikiUpdatePage(srv WikiService_WikiUpdatePageServer) error {
 	return status.Errorf(codes.Unimplemented, "method WikiUpdatePage not implemented")
 }
-func (*UnimplementedWikiServiceServer) WikiDeletePage(ctx context.Context, req *WikiDeletePageRequest) (*WikiDeletePageResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method WikiDeletePage not implemented")
-}
 func (*UnimplementedWikiServiceServer) WikiFindPage(req *WikiFindPageRequest, srv WikiService_WikiFindPageServer) error {
 	return status.Errorf(codes.Unimplemented, "method WikiFindPage not implemented")
 }
@@ -1314,24 +1210,6 @@ func (x *wikiServiceWikiUpdatePageServer) Recv() (*WikiUpdatePageRequest, error)
 	return m, nil
 }
 
-func _WikiService_WikiDeletePage_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(WikiDeletePageRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(WikiServiceServer).WikiDeletePage(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/gitaly.WikiService/WikiDeletePage",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(WikiServiceServer).WikiDeletePage(ctx, req.(*WikiDeletePageRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
 func _WikiService_WikiFindPage_Handler(srv interface{}, stream grpc.ServerStream) error {
 	m := new(WikiFindPageRequest)
 	if err := stream.RecvMsg(m); err != nil {
@@ -1398,12 +1276,7 @@ func (x *wikiServiceWikiListPagesServer) Send(m *WikiListPagesResponse) error {
 var _WikiService_serviceDesc = grpc.ServiceDesc{
 	ServiceName: "gitaly.WikiService",
 	HandlerType: (*WikiServiceServer)(nil),
-	Methods: []grpc.MethodDesc{
-		{
-			MethodName: "WikiDeletePage",
-			Handler:    _WikiService_WikiDeletePage_Handler,
-		},
-	},
+	Methods:     []grpc.MethodDesc{},
 	Streams: []grpc.StreamDesc{
 		{
 			StreamName:    "WikiWritePage",
diff --git a/proto/wiki.proto b/proto/wiki.proto
index c23584338..5cb1b71c2 100644
--- a/proto/wiki.proto
+++ b/proto/wiki.proto
@@ -18,11 +18,6 @@ service WikiService {
       op: MUTATOR
     };
   }
-  rpc WikiDeletePage(WikiDeletePageRequest) returns (WikiDeletePageResponse) {
-    option (op_type) = {
-      op: MUTATOR
-    };
-  }
   // WikiFindPage returns a stream because the page's raw_data field may be arbitrarily large.
   rpc WikiFindPage(WikiFindPageRequest) returns (stream WikiFindPageResponse) {
     option (op_type) = {
@@ -101,14 +96,6 @@ message WikiUpdatePageResponse {
   bytes error = 1;
 }
 
-message WikiDeletePageRequest {
-  Repository repository = 1 [(target_repository)=true];
-  bytes page_path = 2;
-  WikiCommitDetails commit_details = 3;
-}
-
-message WikiDeletePageResponse {}
-
 message WikiFindPageRequest {
   Repository repository = 1 [(target_repository)=true];
   bytes title = 2;
diff --git a/ruby/lib/gitaly_server/wiki_service.rb b/ruby/lib/gitaly_server/wiki_service.rb
index b92cd34ff..7c586e93f 100644
--- a/ruby/lib/gitaly_server/wiki_service.rb
+++ b/ruby/lib/gitaly_server/wiki_service.rb
@@ -2,17 +2,6 @@ module GitalyServer
   class WikiService < Gitaly::WikiService::Service
     include Utils
 
-    def wiki_delete_page(request, call)
-      repo = Gitlab::Git::Repository.from_gitaly(request.repository, call)
-      wiki = Gitlab::Git::Wiki.new(repo)
-      page_path = set_utf8!(request.page_path)
-      commit_details = commit_details_from_gitaly(request.commit_details)
-
-      wiki.delete_page(page_path, commit_details)
-
-      Gitaly::WikiDeletePageResponse.new
-    end
-
     def wiki_write_page(call)
       repo = name = format = commit_details = nil
       content = ""
diff --git a/ruby/lib/gitlab/git/wiki.rb b/ruby/lib/gitlab/git/wiki.rb
index 445feb0a2..452351afd 100644
--- a/ruby/lib/gitlab/git/wiki.rb
+++ b/ruby/lib/gitlab/git/wiki.rb
@@ -31,10 +31,6 @@ module Gitlab
         gollum_write_page(name, format, content, commit_details)
       end
 
-      def delete_page(page_path, commit_details)
-        gollum_delete_page(page_path, commit_details)
-      end
-
       def update_page(page_path, title, format, content, commit_details)
         gollum_update_page(page_path, title, format, content, commit_details)
       end
@@ -137,14 +133,6 @@ module Gitlab
         raise Gitlab::Git::Wiki::DuplicatePageError, e.message
       end
 
-      def gollum_delete_page(page_path, commit_details)
-        assert_type!(commit_details, CommitDetails)
-
-        with_committer_with_hooks(commit_details) do |committer|
-          gollum_wiki.delete_page(gollum_page_by_path(page_path), committer: committer)
-        end
-      end
-
       def gollum_update_page(page_path, title, format, content, commit_details)
         assert_type!(format, Symbol)
         assert_type!(commit_details, CommitDetails)
diff --git a/ruby/proto/gitaly/wiki_pb.rb b/ruby/proto/gitaly/wiki_pb.rb
index b655a5299..f650820bc 100644
--- a/ruby/proto/gitaly/wiki_pb.rb
+++ b/ruby/proto/gitaly/wiki_pb.rb
@@ -49,13 +49,6 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
     add_message "gitaly.WikiUpdatePageResponse" do
       optional :error, :bytes, 1
     end
-    add_message "gitaly.WikiDeletePageRequest" do
-      optional :repository, :message, 1, "gitaly.Repository"
-      optional :page_path, :bytes, 2
-      optional :commit_details, :message, 3, "gitaly.WikiCommitDetails"
-    end
-    add_message "gitaly.WikiDeletePageResponse" do
-    end
     add_message "gitaly.WikiFindPageRequest" do
       optional :repository, :message, 1, "gitaly.Repository"
       optional :title, :bytes, 2
@@ -104,8 +97,6 @@ module Gitaly
   WikiWritePageResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.WikiWritePageResponse").msgclass
   WikiUpdatePageRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.WikiUpdatePageRequest").msgclass
   WikiUpdatePageResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.WikiUpdatePageResponse").msgclass
-  WikiDeletePageRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.WikiDeletePageRequest").msgclass
-  WikiDeletePageResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.WikiDeletePageResponse").msgclass
   WikiFindPageRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.WikiFindPageRequest").msgclass
   WikiFindPageResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.WikiFindPageResponse").msgclass
   WikiGetAllPagesRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.WikiGetAllPagesRequest").msgclass
diff --git a/ruby/proto/gitaly/wiki_services_pb.rb b/ruby/proto/gitaly/wiki_services_pb.rb
index d1cd1ceaa..cb63ec25a 100644
--- a/ruby/proto/gitaly/wiki_services_pb.rb
+++ b/ruby/proto/gitaly/wiki_services_pb.rb
@@ -16,7 +16,6 @@ module Gitaly
 
       rpc :WikiWritePage, stream(Gitaly::WikiWritePageRequest), Gitaly::WikiWritePageResponse
       rpc :WikiUpdatePage, stream(Gitaly::WikiUpdatePageRequest), Gitaly::WikiUpdatePageResponse
-      rpc :WikiDeletePage, Gitaly::WikiDeletePageRequest, Gitaly::WikiDeletePageResponse
       # WikiFindPage returns a stream because the page's raw_data field may be arbitrarily large.
       rpc :WikiFindPage, Gitaly::WikiFindPageRequest, stream(Gitaly::WikiFindPageResponse)
       rpc :WikiGetAllPages, Gitaly::WikiGetAllPagesRequest, stream(Gitaly::WikiGetAllPagesResponse)
diff --git a/ruby/spec/lib/gitlab/git/wiki_spec.rb b/ruby/spec/lib/gitlab/git/wiki_spec.rb
index 78745cc99..aca0f0dee 100644
--- a/ruby/spec/lib/gitlab/git/wiki_spec.rb
+++ b/ruby/spec/lib/gitlab/git/wiki_spec.rb
@@ -102,18 +102,6 @@ describe Gitlab::Git::Wiki do
     end
   end
 
-  describe '#delete_page' do
-    it 'only removes the page with the same path' do
-      create_page('page1', 'content')
-      create_page('*', 'content')
-
-      subject.delete_page('*', commit_details('whatever'))
-
-      expect(subject.pages.count).to eq(1)
-      expect(subject.pages.first.title).to eq('page1')
-    end
-  end
-
   describe '#update_page' do
     let(:old_title) { 'page1' }
     let(:new_content) { 'different content' }