Merge branch 'zj-remove-wiki-get-page-version' into 'master'

wiki: Remove GetPageVersions RPC

See merge request gitlab-org/gitaly!3490

9 files changed, 85 insertions, 576 deletions

diff --git a/internal/gitaly/service/wiki/get_page_versions.go b/internal/gitaly/service/wiki/get_page_versions.go
deleted file mode 100644
index 4585814f0..000000000
--- a/internal/gitaly/service/wiki/get_page_versions.go
+++ /dev/null
@@ -1,41 +0,0 @@
-package wiki
-
-import (
-	"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) WikiGetPageVersions(request *gitalypb.WikiGetPageVersionsRequest, stream gitalypb.WikiService_WikiGetPageVersionsServer) error {
-	ctx := stream.Context()
-
-	if len(request.GetPagePath()) == 0 {
-		return status.Errorf(codes.InvalidArgument, "WikiGetPageVersions: Empty Path")
-	}
-
-	client, err := s.ruby.WikiServiceClient(ctx)
-	if err != nil {
-		return err
-	}
-
-	clientCtx, err := rubyserver.SetHeaders(ctx, s.locator, request.GetRepository())
-	if err != nil {
-		return err
-	}
-
-	rubyStream, err := client.WikiGetPageVersions(clientCtx, request)
-	if err != nil {
-		return err
-	}
-
-	return rubyserver.Proxy(func() error {
-		resp, err := rubyStream.Recv()
-		if err != nil {
-			md := rubyStream.Trailer()
-			stream.SetTrailer(md)
-			return err
-		}
-		return stream.Send(resp)
-	})
-}
diff --git a/internal/gitaly/service/wiki/get_page_versions_test.go b/internal/gitaly/service/wiki/get_page_versions_test.go
deleted file mode 100644
index 6b6235974..000000000
--- a/internal/gitaly/service/wiki/get_page_versions_test.go
+++ /dev/null
@@ -1,184 +0,0 @@
-package wiki
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"gitlab.com/gitlab-org/gitaly/internal/git/gittest"
-	"gitlab.com/gitlab-org/gitaly/internal/gitaly/config"
-	"gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver"
-	"gitlab.com/gitlab-org/gitaly/internal/helper/text"
-	"gitlab.com/gitlab-org/gitaly/internal/testhelper"
-	"gitlab.com/gitlab-org/gitaly/proto/go/gitalypb"
-)
-
-func testWikiGetPageVersionsRequest(t *testing.T, cfg config.Cfg, rubySrv *rubyserver.Server) {
-	wikiRepo, wikiRepoPath, cleanupFunc := setupWikiRepo(t, cfg)
-	defer cleanupFunc()
-
-	ctx, cancel := testhelper.Context()
-	defer cancel()
-
-	client := setupWikiService(t, cfg, rubySrv)
-
-	const pageTitle = "WikiGétPageVersions"
-
-	content := bytes.Repeat([]byte("Mock wiki page content"), 10000)
-	writeWikiPage(t, client, wikiRepo, createWikiPageOpts{title: pageTitle, content: content})
-	v1cid := gittest.Exec(t, cfg, "-C", wikiRepoPath, "log", "-1", "--format=%H")
-	updateWikiPage(t, client, wikiRepo, pageTitle, []byte("New content"))
-	v2cid := gittest.Exec(t, cfg, "-C", wikiRepoPath, "log", "-1", "--format=%H")
-
-	gitAuthor := &gitalypb.CommitAuthor{
-		Name:  []byte("Ahmad Sherif"),
-		Email: []byte("ahmad@gitlab.com"),
-	}
-
-	testCases := []struct {
-		desc     string
-		request  *gitalypb.WikiGetPageVersionsRequest
-		versions []*gitalypb.WikiPageVersion
-	}{
-		{
-			desc: "No page found",
-			request: &gitalypb.WikiGetPageVersionsRequest{
-				Repository: wikiRepo,
-				PagePath:   []byte("not-found"),
-			},
-			versions: nil,
-		},
-		{
-			desc: "2 version found",
-			request: &gitalypb.WikiGetPageVersionsRequest{
-				Repository: wikiRepo,
-				PagePath:   []byte(pageTitle),
-			},
-			versions: []*gitalypb.WikiPageVersion{
-				{
-					Commit: &gitalypb.GitCommit{
-						Id:        text.ChompBytes(v2cid),
-						Body:      []byte("Update WikiGétPageVersions"),
-						Subject:   []byte("Update WikiGétPageVersions"),
-						Author:    gitAuthor,
-						Committer: gitAuthor,
-						ParentIds: []string{text.ChompBytes(v1cid)},
-						BodySize:  26,
-					},
-					Format: "markdown",
-				},
-				{
-					Commit: &gitalypb.GitCommit{
-						Id:        text.ChompBytes(v1cid),
-						Body:      []byte("Add WikiGétPageVersions"),
-						Subject:   []byte("Add WikiGétPageVersions"),
-						Author:    gitAuthor,
-						Committer: gitAuthor,
-						BodySize:  23,
-					},
-					Format: "markdown",
-				},
-			},
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.desc, func(t *testing.T) {
-			stream, err := client.WikiGetPageVersions(ctx, tc.request)
-			require.NoError(t, err)
-			require.NoError(t, stream.CloseSend())
-
-			response, err := stream.Recv()
-			require.NoError(t, err)
-
-			require.Len(t, response.GetVersions(), len(tc.versions))
-			for i, version := range response.GetVersions() {
-				v2 := tc.versions[i]
-
-				assert.Equal(t, version.GetFormat(), v2.GetFormat(),
-					"expected wiki page format to be equal for version %d", i)
-				gittest.CommitEqual(t, version.GetCommit(), v2.GetCommit())
-			}
-		})
-	}
-}
-
-func testWikiGetPageVersionsPaginationParams(t *testing.T, cfg config.Cfg, rubySrv *rubyserver.Server) {
-	wikiRepo, _, cleanupFunc := setupWikiRepo(t, cfg)
-	defer cleanupFunc()
-
-	ctx, cancel := testhelper.Context()
-	defer cancel()
-
-	client := setupWikiService(t, cfg, rubySrv)
-
-	const pageTitle = "WikiGetPageVersions"
-
-	content := []byte("page content")
-	writeWikiPage(t, client, wikiRepo, createWikiPageOpts{title: pageTitle, content: content})
-
-	for i := 0; i < 25; i++ {
-		updateWikiPage(t, client, wikiRepo, pageTitle, []byte(fmt.Sprintf("%d", i)))
-	}
-
-	testCases := []struct {
-		desc        string
-		perPage     int32
-		page        int32
-		nrOfResults int
-	}{
-		{
-			desc:        "default to page 1 with 20 items",
-			nrOfResults: 20,
-		},
-		{
-			desc:        "oversized perPage param",
-			perPage:     100,
-			nrOfResults: 26,
-		},
-		{
-			desc:        "allows later pages",
-			page:        2,
-			nrOfResults: 6,
-		},
-		{
-			desc:        "returns nothing of no versions can be found",
-			page:        100,
-			nrOfResults: 0,
-		},
-		{
-			// https://github.com/gollum/gollum-lib/blob/be6409315f6af5a6d90eb012a1154b485579db67/lib/gollum-lib/pagination.rb#L34
-			desc:        "per page is minimal 20",
-			perPage:     1,
-			nrOfResults: 20,
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.desc, func(t *testing.T) {
-			stream, err := client.WikiGetPageVersions(ctx, &gitalypb.WikiGetPageVersionsRequest{
-				Repository: wikiRepo,
-				PagePath:   []byte(pageTitle),
-				PerPage:    tc.perPage,
-				Page:       tc.page})
-			require.NoError(t, err)
-
-			nrFoundVersions := 0
-			for {
-				resp, err := stream.Recv()
-				if err == io.EOF {
-					break
-				} else if err != nil {
-					t.Fatal(err)
-				}
-
-				nrFoundVersions += len(resp.GetVersions())
-			}
-
-			require.Equal(t, tc.nrOfResults, nrFoundVersions)
-		})
-	}
-}
diff --git a/internal/gitaly/service/wiki/testhelper_test.go b/internal/gitaly/service/wiki/testhelper_test.go
index 932a8bb3a..11ce4e964 100644
--- a/internal/gitaly/service/wiki/testhelper_test.go
+++ b/internal/gitaly/service/wiki/testhelper_test.go
@@ -71,8 +71,6 @@ func TestWithRubySidecar(t *testing.T) {
 		testSuccessfulWikiGetAllPagesRequest,
 		testWikiGetAllPagesSorting,
 		testFailedWikiGetAllPagesDueToValidation,
-		testWikiGetPageVersionsRequest,
-		testWikiGetPageVersionsPaginationParams,
 		testSuccessfulWikiListPagesRequest,
 		testWikiListPagesSorting,
 		testSuccessfulWikiUpdatePageRequest,
@@ -150,37 +148,6 @@ func writeWikiPage(t *testing.T, client gitalypb.WikiServiceClient, wikiRepo *gi
 	require.NoError(t, err)
 }
 
-func updateWikiPage(t *testing.T, client gitalypb.WikiServiceClient, wikiRepo *gitalypb.Repository, name string, content []byte) {
-	t.Helper()
-
-	commitDetails := &gitalypb.WikiCommitDetails{
-		Name:     []byte("Ahmad Sherif"),
-		Email:    []byte("ahmad@gitlab.com"),
-		Message:  []byte("Update " + name),
-		UserId:   int32(1),
-		UserName: []byte("ahmad"),
-	}
-
-	request := &gitalypb.WikiUpdatePageRequest{
-		Repository:    wikiRepo,
-		PagePath:      []byte(name),
-		Title:         []byte(name),
-		Format:        "markdown",
-		CommitDetails: commitDetails,
-		Content:       content,
-	}
-
-	ctx, cancel := testhelper.Context()
-	defer cancel()
-
-	stream, err := client.WikiUpdatePage(ctx)
-	require.NoError(t, err)
-	require.NoError(t, stream.Send(request))
-
-	_, err = stream.CloseAndRecv()
-	require.NoError(t, err)
-}
-
 func setupWikiRepo(t *testing.T, cfg config.Cfg) (*gitalypb.Repository, string, func()) {
 	return gittest.InitBareRepoAt(t, cfg, cfg.Storages[0])
 }
diff --git a/internal/praefect/protoregistry/protoregistry_test.go b/internal/praefect/protoregistry/protoregistry_test.go
index 9d60b4289..7d5a95033 100644
--- a/internal/praefect/protoregistry/protoregistry_test.go
+++ b/internal/praefect/protoregistry/protoregistry_test.go
@@ -158,13 +158,12 @@ func TestNewProtoRegistry(t *testing.T) {
 			"SSHUploadArchive": protoregistry.OpAccessor,
 		},
 		"WikiService": map[string]protoregistry.OpType{
-			"WikiGetPageVersions": protoregistry.OpAccessor,
-			"WikiWritePage":       protoregistry.OpMutator,
-			"WikiUpdatePage":      protoregistry.OpMutator,
-			"WikiDeletePage":      protoregistry.OpMutator,
-			"WikiFindPage":        protoregistry.OpAccessor,
-			"WikiGetAllPages":     protoregistry.OpAccessor,
-			"WikiListPages":       protoregistry.OpAccessor,
+			"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 036f46fcc..fa62071b4 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{13, 0}
+	return fileDescriptor_5c56f90469cec0af, []int{11, 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{15, 0}
+	return fileDescriptor_5c56f90469cec0af, []int{13, 0}
 }
 
 type WikiCommitDetails struct {
@@ -289,108 +289,6 @@ func (m *WikiPage) GetRawData() []byte {
 	return nil
 }
 
-type WikiGetPageVersionsRequest 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"`
-	Page                 int32       `protobuf:"varint,3,opt,name=page,proto3" json:"page,omitempty"`
-	PerPage              int32       `protobuf:"varint,4,opt,name=per_page,json=perPage,proto3" json:"per_page,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
-	XXX_unrecognized     []byte      `json:"-"`
-	XXX_sizecache        int32       `json:"-"`
-}
-
-func (m *WikiGetPageVersionsRequest) Reset()         { *m = WikiGetPageVersionsRequest{} }
-func (m *WikiGetPageVersionsRequest) String() string { return proto.CompactTextString(m) }
-func (*WikiGetPageVersionsRequest) ProtoMessage()    {}
-func (*WikiGetPageVersionsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_5c56f90469cec0af, []int{3}
-}
-
-func (m *WikiGetPageVersionsRequest) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_WikiGetPageVersionsRequest.Unmarshal(m, b)
-}
-func (m *WikiGetPageVersionsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_WikiGetPageVersionsRequest.Marshal(b, m, deterministic)
-}
-func (m *WikiGetPageVersionsRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WikiGetPageVersionsRequest.Merge(m, src)
-}
-func (m *WikiGetPageVersionsRequest) XXX_Size() int {
-	return xxx_messageInfo_WikiGetPageVersionsRequest.Size(m)
-}
-func (m *WikiGetPageVersionsRequest) XXX_DiscardUnknown() {
-	xxx_messageInfo_WikiGetPageVersionsRequest.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_WikiGetPageVersionsRequest proto.InternalMessageInfo
-
-func (m *WikiGetPageVersionsRequest) GetRepository() *Repository {
-	if m != nil {
-		return m.Repository
-	}
-	return nil
-}
-
-func (m *WikiGetPageVersionsRequest) GetPagePath() []byte {
-	if m != nil {
-		return m.PagePath
-	}
-	return nil
-}
-
-func (m *WikiGetPageVersionsRequest) GetPage() int32 {
-	if m != nil {
-		return m.Page
-	}
-	return 0
-}
-
-func (m *WikiGetPageVersionsRequest) GetPerPage() int32 {
-	if m != nil {
-		return m.PerPage
-	}
-	return 0
-}
-
-type WikiGetPageVersionsResponse struct {
-	Versions             []*WikiPageVersion `protobuf:"bytes,1,rep,name=versions,proto3" json:"versions,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
-	XXX_unrecognized     []byte             `json:"-"`
-	XXX_sizecache        int32              `json:"-"`
-}
-
-func (m *WikiGetPageVersionsResponse) Reset()         { *m = WikiGetPageVersionsResponse{} }
-func (m *WikiGetPageVersionsResponse) String() string { return proto.CompactTextString(m) }
-func (*WikiGetPageVersionsResponse) ProtoMessage()    {}
-func (*WikiGetPageVersionsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_5c56f90469cec0af, []int{4}
-}
-
-func (m *WikiGetPageVersionsResponse) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_WikiGetPageVersionsResponse.Unmarshal(m, b)
-}
-func (m *WikiGetPageVersionsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_WikiGetPageVersionsResponse.Marshal(b, m, deterministic)
-}
-func (m *WikiGetPageVersionsResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WikiGetPageVersionsResponse.Merge(m, src)
-}
-func (m *WikiGetPageVersionsResponse) XXX_Size() int {
-	return xxx_messageInfo_WikiGetPageVersionsResponse.Size(m)
-}
-func (m *WikiGetPageVersionsResponse) XXX_DiscardUnknown() {
-	xxx_messageInfo_WikiGetPageVersionsResponse.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_WikiGetPageVersionsResponse proto.InternalMessageInfo
-
-func (m *WikiGetPageVersionsResponse) GetVersions() []*WikiPageVersion {
-	if m != nil {
-		return m.Versions
-	}
-	return nil
-}
-
 // This message is sent in a stream because the 'content' field may be large.
 type WikiWritePageRequest struct {
 	// These following fields are only present in the first message.
@@ -409,7 +307,7 @@ func (m *WikiWritePageRequest) Reset()         { *m = WikiWritePageRequest{} }
 func (m *WikiWritePageRequest) String() string { return proto.CompactTextString(m) }
 func (*WikiWritePageRequest) ProtoMessage()    {}
 func (*WikiWritePageRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_5c56f90469cec0af, []int{5}
+	return fileDescriptor_5c56f90469cec0af, []int{3}
 }
 
 func (m *WikiWritePageRequest) XXX_Unmarshal(b []byte) error {
@@ -476,7 +374,7 @@ func (m *WikiWritePageResponse) Reset()         { *m = WikiWritePageResponse{} }
 func (m *WikiWritePageResponse) String() string { return proto.CompactTextString(m) }
 func (*WikiWritePageResponse) ProtoMessage()    {}
 func (*WikiWritePageResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_5c56f90469cec0af, []int{6}
+	return fileDescriptor_5c56f90469cec0af, []int{4}
 }
 
 func (m *WikiWritePageResponse) XXX_Unmarshal(b []byte) error {
@@ -522,7 +420,7 @@ func (m *WikiUpdatePageRequest) Reset()         { *m = WikiUpdatePageRequest{} }
 func (m *WikiUpdatePageRequest) String() string { return proto.CompactTextString(m) }
 func (*WikiUpdatePageRequest) ProtoMessage()    {}
 func (*WikiUpdatePageRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_5c56f90469cec0af, []int{7}
+	return fileDescriptor_5c56f90469cec0af, []int{5}
 }
 
 func (m *WikiUpdatePageRequest) XXX_Unmarshal(b []byte) error {
@@ -596,7 +494,7 @@ func (m *WikiUpdatePageResponse) Reset()         { *m = WikiUpdatePageResponse{}
 func (m *WikiUpdatePageResponse) String() string { return proto.CompactTextString(m) }
 func (*WikiUpdatePageResponse) ProtoMessage()    {}
 func (*WikiUpdatePageResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_5c56f90469cec0af, []int{8}
+	return fileDescriptor_5c56f90469cec0af, []int{6}
 }
 
 func (m *WikiUpdatePageResponse) XXX_Unmarshal(b []byte) error {
@@ -637,7 +535,7 @@ 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{9}
+	return fileDescriptor_5c56f90469cec0af, []int{7}
 }
 
 func (m *WikiDeletePageRequest) XXX_Unmarshal(b []byte) error {
@@ -689,7 +587,7 @@ 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{10}
+	return fileDescriptor_5c56f90469cec0af, []int{8}
 }
 
 func (m *WikiDeletePageResponse) XXX_Unmarshal(b []byte) error {
@@ -724,7 +622,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{11}
+	return fileDescriptor_5c56f90469cec0af, []int{9}
 }
 
 func (m *WikiFindPageRequest) XXX_Unmarshal(b []byte) error {
@@ -786,7 +684,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{12}
+	return fileDescriptor_5c56f90469cec0af, []int{10}
 }
 
 func (m *WikiFindPageResponse) XXX_Unmarshal(b []byte) error {
@@ -829,7 +727,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{13}
+	return fileDescriptor_5c56f90469cec0af, []int{11}
 }
 
 func (m *WikiGetAllPagesRequest) XXX_Unmarshal(b []byte) error {
@@ -892,7 +790,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{14}
+	return fileDescriptor_5c56f90469cec0af, []int{12}
 }
 
 func (m *WikiGetAllPagesResponse) XXX_Unmarshal(b []byte) error {
@@ -943,7 +841,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{15}
+	return fileDescriptor_5c56f90469cec0af, []int{13}
 }
 
 func (m *WikiListPagesRequest) XXX_Unmarshal(b []byte) error {
@@ -1011,7 +909,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{16}
+	return fileDescriptor_5c56f90469cec0af, []int{14}
 }
 
 func (m *WikiListPagesResponse) XXX_Unmarshal(b []byte) error {
@@ -1045,8 +943,6 @@ func init() {
 	proto.RegisterType((*WikiCommitDetails)(nil), "gitaly.WikiCommitDetails")
 	proto.RegisterType((*WikiPageVersion)(nil), "gitaly.WikiPageVersion")
 	proto.RegisterType((*WikiPage)(nil), "gitaly.WikiPage")
-	proto.RegisterType((*WikiGetPageVersionsRequest)(nil), "gitaly.WikiGetPageVersionsRequest")
-	proto.RegisterType((*WikiGetPageVersionsResponse)(nil), "gitaly.WikiGetPageVersionsResponse")
 	proto.RegisterType((*WikiWritePageRequest)(nil), "gitaly.WikiWritePageRequest")
 	proto.RegisterType((*WikiWritePageResponse)(nil), "gitaly.WikiWritePageResponse")
 	proto.RegisterType((*WikiUpdatePageRequest)(nil), "gitaly.WikiUpdatePageRequest")
@@ -1064,71 +960,66 @@ func init() {
 func init() { proto.RegisterFile("wiki.proto", fileDescriptor_5c56f90469cec0af) }
 
 var fileDescriptor_5c56f90469cec0af = []byte{
-	// 1014 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x57, 0x4f, 0x6f, 0x1b, 0x45,
-	0x14, 0x67, 0x1d, 0xff, 0x59, 0xbf, 0xc4, 0x6e, 0x3a, 0x94, 0x66, 0xeb, 0x84, 0x10, 0x6d, 0xa8,
-	0x30, 0x12, 0x38, 0x25, 0x3d, 0x00, 0x12, 0x48, 0x4d, 0xea, 0x10, 0x55, 0xaa, 0xa0, 0xda, 0x98,
-	0x46, 0x20, 0xa4, 0xd5, 0x64, 0x77, 0x6c, 0x8f, 0xba, 0xde, 0x59, 0x66, 0xc6, 0x89, 0x72, 0xe6,
-	0x0c, 0x57, 0xb8, 0x21, 0xf1, 0x09, 0xf8, 0x14, 0x7c, 0x06, 0xbe, 0x02, 0x27, 0xae, 0x88, 0x13,
-	0x9a, 0x99, 0xb5, 0xbd, 0xbb, 0xb6, 0x03, 0x81, 0x08, 0xf5, 0xb6, 0xef, 0xcf, 0xbc, 0x79, 0xbf,
-	0xdf, 0xfb, 0x33, 0x36, 0xc0, 0x05, 0x7d, 0x41, 0x3b, 0x09, 0x67, 0x92, 0xa1, 0xea, 0x80, 0x4a,
-	0x1c, 0x5d, 0xb6, 0x20, 0xa2, 0xb1, 0x34, 0xba, 0xd6, 0x9a, 0x18, 0x62, 0x4e, 0x42, 0x23, 0xb9,
-	0xdf, 0x5a, 0x70, 0xfb, 0x94, 0xbe, 0xa0, 0x8f, 0xd9, 0x68, 0x44, 0x65, 0x97, 0x48, 0x4c, 0x23,
-	0x81, 0x10, 0x94, 0x63, 0x3c, 0x22, 0x8e, 0xb5, 0x63, 0xb5, 0xd7, 0x3c, 0xfd, 0x8d, 0xee, 0x40,
-	0x85, 0x8c, 0x30, 0x8d, 0x9c, 0x92, 0x56, 0x1a, 0x01, 0x39, 0x50, 0x1b, 0x11, 0x21, 0xf0, 0x80,
-	0x38, 0x2b, 0x5a, 0x3f, 0x11, 0xd1, 0x06, 0xd4, 0xc6, 0x82, 0x70, 0x9f, 0x86, 0x4e, 0x79, 0xc7,
-	0x6a, 0x57, 0xbc, 0xaa, 0x12, 0x9f, 0x84, 0x68, 0x13, 0xea, 0xda, 0xa0, 0x6f, 0xa8, 0xe8, 0x43,
-	0xb6, 0x52, 0x7c, 0x8a, 0x47, 0xc4, 0xed, 0xc1, 0x2d, 0x95, 0xce, 0x33, 0x3c, 0x20, 0xcf, 0x09,
-	0x17, 0x94, 0xc5, 0xe8, 0x6d, 0xa8, 0x06, 0x3a, 0x3b, 0x9d, 0xce, 0xea, 0xfe, 0xed, 0x8e, 0x41,
-	0xd5, 0x39, 0xa6, 0xd2, 0xa4, 0xed, 0xa5, 0x0e, 0xe8, 0x2e, 0x54, 0xfb, 0x8c, 0x8f, 0xb0, 0xd4,
-	0x49, 0xd6, 0xbd, 0x54, 0x72, 0x7f, 0xb3, 0xc0, 0x9e, 0x84, 0x45, 0xef, 0x41, 0xed, 0xdc, 0x84,
-	0x4e, 0x03, 0x6e, 0x4c, 0x02, 0x16, 0x6e, 0xf6, 0x26, 0x7e, 0xcb, 0xe2, 0x2a, 0x4e, 0x24, 0x95,
-	0xd1, 0x04, 0xbb, 0x11, 0xd0, 0x3d, 0xb0, 0xc7, 0x3c, 0xf2, 0x13, 0x2c, 0x87, 0x1a, 0x7a, 0xdd,
-	0xab, 0x8d, 0x79, 0xf4, 0x0c, 0xcb, 0xa1, 0x22, 0x56, 0xab, 0x0d, 0x6c, 0xfd, 0x3d, 0x25, 0xbb,
-	0x9a, 0x21, 0x7b, 0x1b, 0x60, 0x48, 0x85, 0x64, 0x9c, 0x06, 0x38, 0x72, 0x6a, 0x3b, 0x56, 0xdb,
-	0xf6, 0x32, 0x1a, 0x75, 0x05, 0xc7, 0x17, 0x7e, 0x88, 0x25, 0x76, 0x6c, 0xc3, 0x3b, 0xc7, 0x17,
-	0x5d, 0x2c, 0xb1, 0xfb, 0x93, 0x05, 0x2d, 0x05, 0xe4, 0x98, 0xc8, 0x0c, 0x16, 0xe1, 0x91, 0xaf,
-	0xc7, 0x44, 0x48, 0xf4, 0x01, 0x00, 0x27, 0x09, 0x13, 0x54, 0x32, 0x7e, 0x99, 0x12, 0x80, 0x26,
-	0x04, 0x78, 0x53, 0xcb, 0x61, 0xf9, 0x87, 0x5f, 0xde, 0xb1, 0xbc, 0x8c, 0xaf, 0xaa, 0x5b, 0x82,
-	0x07, 0xc4, 0xe0, 0x32, 0x4d, 0x60, 0x2b, 0xc5, 0x0c, 0x58, 0xda, 0x04, 0x15, 0x4f, 0x7f, 0xab,
-	0x24, 0x13, 0xc2, 0x7d, 0xad, 0x37, 0x2d, 0x50, 0x4b, 0x08, 0x57, 0x49, 0xb9, 0x1e, 0x6c, 0x2e,
-	0xcc, 0x51, 0x24, 0x2c, 0x16, 0x04, 0x3d, 0x04, 0x3b, 0xa5, 0x5e, 0x38, 0xd6, 0xce, 0xca, 0x55,
-	0x35, 0x9a, 0x3a, 0xba, 0xbf, 0x5a, 0x70, 0x47, 0x59, 0x4f, 0x39, 0x95, 0x44, 0xb9, 0xfc, 0x77,
-	0xc8, 0x93, 0xd2, 0x94, 0x32, 0xa5, 0x99, 0xf5, 0xc2, 0x4a, 0xae, 0x17, 0x1e, 0x41, 0xd3, 0x74,
-	0xa1, 0x1f, 0x9a, 0x29, 0xd2, 0x98, 0x57, 0xf7, 0xef, 0x65, 0x33, 0xcf, 0x8d, 0x99, 0xd7, 0x08,
-	0x72, 0x53, 0xe7, 0x40, 0x2d, 0x60, 0xb1, 0x24, 0xb1, 0x4c, 0xfb, 0x63, 0x22, 0xba, 0x8f, 0xe0,
-	0xb5, 0x02, 0xb2, 0x94, 0xa8, 0xb7, 0xe0, 0x56, 0x38, 0x4e, 0x22, 0x1a, 0x60, 0x49, 0x7c, 0xc2,
-	0x39, 0xe3, 0xe9, 0xcc, 0x36, 0xa7, 0xea, 0x23, 0xa5, 0x75, 0xff, 0xb0, 0x4c, 0x88, 0xcf, 0x93,
-	0x10, 0xdf, 0x14, 0x3b, 0x57, 0x36, 0xc4, 0xe2, 0xd1, 0x98, 0x91, 0x57, 0xfe, 0x1b, 0xf2, 0x2a,
-	0xff, 0x9e, 0xbc, 0x6a, 0x9e, 0xbc, 0x0e, 0xdc, 0x2d, 0x22, 0x4f, 0xd9, 0x53, 0x2b, 0x2d, 0xc3,
-	0x99, 0x11, 0xdc, 0x9f, 0x53, 0xaa, 0xba, 0x24, 0x22, 0xff, 0x0b, 0x55, 0xf3, 0xe0, 0x57, 0xae,
-	0x07, 0xde, 0x75, 0x0c, 0xc4, 0x6c, 0xc6, 0x06, 0xa2, 0xfb, 0xa3, 0x05, 0xaf, 0x2a, 0xd3, 0x27,
-	0x34, 0x0e, 0x6f, 0x06, 0xca, 0xb4, 0xb0, 0xa5, 0x6c, 0x61, 0x5b, 0x60, 0x73, 0x72, 0x4e, 0xf5,
-	0x56, 0x35, 0x15, 0x9f, 0xca, 0x68, 0x0b, 0xea, 0x21, 0xe5, 0x24, 0xd0, 0x57, 0x95, 0xb5, 0x71,
-	0xa6, 0x70, 0x3f, 0x32, 0x53, 0x3b, 0x4b, 0x30, 0x2d, 0xce, 0x9b, 0xe9, 0x46, 0x31, 0xb9, 0xad,
-	0x17, 0xe7, 0xdf, 0xec, 0x18, 0xf7, 0x77, 0xcb, 0x40, 0x3f, 0x26, 0xf2, 0x20, 0x8a, 0x94, 0x41,
-	0xdc, 0x08, 0xc4, 0x88, 0xaa, 0x07, 0x47, 0x41, 0x6c, 0x78, 0x46, 0x40, 0xf7, 0xa1, 0x69, 0xb2,
-	0xa6, 0x2c, 0xf6, 0x43, 0x22, 0x02, 0x0d, 0xd4, 0xf6, 0x1a, 0x53, 0x6d, 0x97, 0x88, 0x00, 0x7d,
-	0x08, 0x65, 0xc1, 0xb8, 0x69, 0xf0, 0xe6, 0xfe, 0xfd, 0x6c, 0xde, 0xf3, 0x49, 0x76, 0x4e, 0x18,
-	0x97, 0x87, 0x97, 0x9e, 0x3e, 0xe2, 0xee, 0x42, 0xd5, 0xc8, 0xa8, 0x0e, 0x95, 0xde, 0x93, 0xde,
-	0xd3, 0xa3, 0xf5, 0x57, 0x50, 0x13, 0xe0, 0xb1, 0x77, 0x74, 0xd0, 0x3b, 0xea, 0xfa, 0x07, 0xbd,
-	0x75, 0xcb, 0xf5, 0x61, 0x63, 0x2e, 0xd6, 0x75, 0x28, 0x43, 0xdb, 0xb0, 0x4a, 0xe2, 0xd0, 0x67,
-	0x7d, 0xb3, 0x99, 0x4b, 0x1a, 0x44, 0x9d, 0xc4, 0xe1, 0x67, 0x7d, 0xbd, 0x9b, 0xbf, 0x29, 0x99,
-	0x8a, 0x3c, 0xa5, 0x42, 0xbe, 0x0c, 0x84, 0xbe, 0x9f, 0x23, 0x74, 0x37, 0x8b, 0xaa, 0x98, 0x62,
-	0x8e, 0x4e, 0xb5, 0x6c, 0x58, 0xbf, 0x2f, 0x88, 0x59, 0xa7, 0x0d, 0x2f, 0x95, 0xfe, 0x19, 0xcd,
-	0x1f, 0x9b, 0x25, 0x90, 0xb9, 0xe1, 0x3a, 0x24, 0xef, 0x7f, 0x57, 0x81, 0x55, 0xa5, 0x3a, 0x21,
-	0xfc, 0x9c, 0x06, 0x04, 0x0d, 0xcd, 0x18, 0x16, 0x1e, 0x3c, 0xe4, 0x16, 0xda, 0x63, 0xc1, 0x8b,
-	0xdd, 0xda, 0xbd, 0xd2, 0x27, 0x9d, 0xf3, 0xea, 0x9f, 0xdf, 0xb7, 0x4b, 0x76, 0xe9, 0x81, 0x85,
-	0x9e, 0x43, 0x23, 0xf7, 0x56, 0xa0, 0xad, 0xec, 0xf9, 0xe2, 0xe3, 0xd8, 0x7a, 0x7d, 0x89, 0x35,
-	0x17, 0xd7, 0x6a, 0x5b, 0xe8, 0x0b, 0x68, 0xe6, 0xd7, 0x28, 0xca, 0x1d, 0x9d, 0x7b, 0x58, 0x5a,
-	0xdb, 0xcb, 0xcc, 0x73, 0xa1, 0x4f, 0x4d, 0xe8, 0xd9, 0xfa, 0xca, 0x87, 0x9e, 0x5b, 0xc4, 0xf9,
-	0xd0, 0x0b, 0xb6, 0x5e, 0x1a, 0x1a, 0x9d, 0xc0, 0x5a, 0x76, 0xb7, 0xa0, 0xcd, 0xec, 0xb9, 0xc2,
-	0x4a, 0x6c, 0x6d, 0x2d, 0x36, 0xce, 0x11, 0xfc, 0x95, 0xf9, 0x89, 0x9a, 0x19, 0x40, 0xb4, 0x7d,
-	0xf5, 0x94, 0xb7, 0xde, 0x58, 0x6a, 0x5f, 0x56, 0xbe, 0x69, 0xdf, 0xe5, 0xcb, 0x57, 0x6c, 0xf8,
-	0x7c, 0xf9, 0xe6, 0x9a, 0x75, 0x16, 0xf7, 0xf0, 0xc1, 0x97, 0xca, 0x33, 0xc2, 0x67, 0x9d, 0x80,
-	0x8d, 0xf6, 0xcc, 0xe7, 0xbb, 0x8c, 0x0f, 0xf6, 0xcc, 0xf9, 0x3d, 0xfd, 0x77, 0x60, 0x6f, 0xc0,
-	0x52, 0x39, 0x39, 0x3b, 0xab, 0x6a, 0xd5, 0xc3, 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0x29, 0xb1,
-	0x3b, 0xcf, 0x51, 0x0c, 0x00, 0x00,
+	// 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,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -1143,7 +1034,6 @@ const _ = grpc.SupportPackageIsVersion4
 //
 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type WikiServiceClient interface {
-	WikiGetPageVersions(ctx context.Context, in *WikiGetPageVersionsRequest, opts ...grpc.CallOption) (WikiService_WikiGetPageVersionsClient, error)
 	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)
@@ -1161,40 +1051,8 @@ func NewWikiServiceClient(cc *grpc.ClientConn) WikiServiceClient {
 	return &wikiServiceClient{cc}
 }
 
-func (c *wikiServiceClient) WikiGetPageVersions(ctx context.Context, in *WikiGetPageVersionsRequest, opts ...grpc.CallOption) (WikiService_WikiGetPageVersionsClient, error) {
-	stream, err := c.cc.NewStream(ctx, &_WikiService_serviceDesc.Streams[0], "/gitaly.WikiService/WikiGetPageVersions", opts...)
-	if err != nil {
-		return nil, err
-	}
-	x := &wikiServiceWikiGetPageVersionsClient{stream}
-	if err := x.ClientStream.SendMsg(in); err != nil {
-		return nil, err
-	}
-	if err := x.ClientStream.CloseSend(); err != nil {
-		return nil, err
-	}
-	return x, nil
-}
-
-type WikiService_WikiGetPageVersionsClient interface {
-	Recv() (*WikiGetPageVersionsResponse, error)
-	grpc.ClientStream
-}
-
-type wikiServiceWikiGetPageVersionsClient struct {
-	grpc.ClientStream
-}
-
-func (x *wikiServiceWikiGetPageVersionsClient) Recv() (*WikiGetPageVersionsResponse, error) {
-	m := new(WikiGetPageVersionsResponse)
-	if err := x.ClientStream.RecvMsg(m); err != nil {
-		return nil, err
-	}
-	return m, nil
-}
-
 func (c *wikiServiceClient) WikiWritePage(ctx context.Context, opts ...grpc.CallOption) (WikiService_WikiWritePageClient, error) {
-	stream, err := c.cc.NewStream(ctx, &_WikiService_serviceDesc.Streams[1], "/gitaly.WikiService/WikiWritePage", opts...)
+	stream, err := c.cc.NewStream(ctx, &_WikiService_serviceDesc.Streams[0], "/gitaly.WikiService/WikiWritePage", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1228,7 +1086,7 @@ func (x *wikiServiceWikiWritePageClient) CloseAndRecv() (*WikiWritePageResponse,
 }
 
 func (c *wikiServiceClient) WikiUpdatePage(ctx context.Context, opts ...grpc.CallOption) (WikiService_WikiUpdatePageClient, error) {
-	stream, err := c.cc.NewStream(ctx, &_WikiService_serviceDesc.Streams[2], "/gitaly.WikiService/WikiUpdatePage", opts...)
+	stream, err := c.cc.NewStream(ctx, &_WikiService_serviceDesc.Streams[1], "/gitaly.WikiService/WikiUpdatePage", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1271,7 +1129,7 @@ func (c *wikiServiceClient) WikiDeletePage(ctx context.Context, in *WikiDeletePa
 }
 
 func (c *wikiServiceClient) WikiFindPage(ctx context.Context, in *WikiFindPageRequest, opts ...grpc.CallOption) (WikiService_WikiFindPageClient, error) {
-	stream, err := c.cc.NewStream(ctx, &_WikiService_serviceDesc.Streams[3], "/gitaly.WikiService/WikiFindPage", opts...)
+	stream, err := c.cc.NewStream(ctx, &_WikiService_serviceDesc.Streams[2], "/gitaly.WikiService/WikiFindPage", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1303,7 +1161,7 @@ func (x *wikiServiceWikiFindPageClient) Recv() (*WikiFindPageResponse, error) {
 }
 
 func (c *wikiServiceClient) WikiGetAllPages(ctx context.Context, in *WikiGetAllPagesRequest, opts ...grpc.CallOption) (WikiService_WikiGetAllPagesClient, error) {
-	stream, err := c.cc.NewStream(ctx, &_WikiService_serviceDesc.Streams[4], "/gitaly.WikiService/WikiGetAllPages", opts...)
+	stream, err := c.cc.NewStream(ctx, &_WikiService_serviceDesc.Streams[3], "/gitaly.WikiService/WikiGetAllPages", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1335,7 +1193,7 @@ func (x *wikiServiceWikiGetAllPagesClient) Recv() (*WikiGetAllPagesResponse, err
 }
 
 func (c *wikiServiceClient) WikiListPages(ctx context.Context, in *WikiListPagesRequest, opts ...grpc.CallOption) (WikiService_WikiListPagesClient, error) {
-	stream, err := c.cc.NewStream(ctx, &_WikiService_serviceDesc.Streams[5], "/gitaly.WikiService/WikiListPages", opts...)
+	stream, err := c.cc.NewStream(ctx, &_WikiService_serviceDesc.Streams[4], "/gitaly.WikiService/WikiListPages", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1368,7 +1226,6 @@ func (x *wikiServiceWikiListPagesClient) Recv() (*WikiListPagesResponse, error)
 
 // WikiServiceServer is the server API for WikiService service.
 type WikiServiceServer interface {
-	WikiGetPageVersions(*WikiGetPageVersionsRequest, WikiService_WikiGetPageVersionsServer) error
 	WikiWritePage(WikiService_WikiWritePageServer) error
 	WikiUpdatePage(WikiService_WikiUpdatePageServer) error
 	WikiDeletePage(context.Context, *WikiDeletePageRequest) (*WikiDeletePageResponse, error)
@@ -1382,9 +1239,6 @@ type WikiServiceServer interface {
 type UnimplementedWikiServiceServer struct {
 }
 
-func (*UnimplementedWikiServiceServer) WikiGetPageVersions(req *WikiGetPageVersionsRequest, srv WikiService_WikiGetPageVersionsServer) error {
-	return status.Errorf(codes.Unimplemented, "method WikiGetPageVersions not implemented")
-}
 func (*UnimplementedWikiServiceServer) WikiWritePage(srv WikiService_WikiWritePageServer) error {
 	return status.Errorf(codes.Unimplemented, "method WikiWritePage not implemented")
 }
@@ -1408,27 +1262,6 @@ func RegisterWikiServiceServer(s *grpc.Server, srv WikiServiceServer) {
 	s.RegisterService(&_WikiService_serviceDesc, srv)
 }
 
-func _WikiService_WikiGetPageVersions_Handler(srv interface{}, stream grpc.ServerStream) error {
-	m := new(WikiGetPageVersionsRequest)
-	if err := stream.RecvMsg(m); err != nil {
-		return err
-	}
-	return srv.(WikiServiceServer).WikiGetPageVersions(m, &wikiServiceWikiGetPageVersionsServer{stream})
-}
-
-type WikiService_WikiGetPageVersionsServer interface {
-	Send(*WikiGetPageVersionsResponse) error
-	grpc.ServerStream
-}
-
-type wikiServiceWikiGetPageVersionsServer struct {
-	grpc.ServerStream
-}
-
-func (x *wikiServiceWikiGetPageVersionsServer) Send(m *WikiGetPageVersionsResponse) error {
-	return x.ServerStream.SendMsg(m)
-}
-
 func _WikiService_WikiWritePage_Handler(srv interface{}, stream grpc.ServerStream) error {
 	return srv.(WikiServiceServer).WikiWritePage(&wikiServiceWikiWritePageServer{stream})
 }
@@ -1573,11 +1406,6 @@ var _WikiService_serviceDesc = grpc.ServiceDesc{
 	},
 	Streams: []grpc.StreamDesc{
 		{
-			StreamName:    "WikiGetPageVersions",
-			Handler:       _WikiService_WikiGetPageVersions_Handler,
-			ServerStreams: true,
-		},
-		{
 			StreamName:    "WikiWritePage",
 			Handler:       _WikiService_WikiWritePage_Handler,
 			ClientStreams: true,
diff --git a/proto/wiki.proto b/proto/wiki.proto
index 453920fc6..c23584338 100644
--- a/proto/wiki.proto
+++ b/proto/wiki.proto
@@ -8,11 +8,6 @@ package gitaly;
 option go_package = "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb";
 
 service WikiService {
-  rpc WikiGetPageVersions(WikiGetPageVersionsRequest) returns (stream WikiGetPageVersionsResponse) {
-    option (op_type) = {
-      op: ACCESSOR
-    };
-  }
   rpc WikiWritePage(stream WikiWritePageRequest) returns (WikiWritePageResponse) {
     option (op_type) = {
       op: MUTATOR
@@ -75,18 +70,6 @@ message WikiPage {
   bytes raw_data = 8;
 }
 
-message WikiGetPageVersionsRequest {
-  Repository repository = 1 [(target_repository)=true];
-  bytes page_path = 2;
-
-  int32 page = 3;
-  int32 per_page = 4;
-}
-
-message WikiGetPageVersionsResponse {
-  repeated WikiPageVersion versions = 1;
-}
-
 // This message is sent in a stream because the 'content' field may be large.
 message WikiWritePageRequest {
   // These following fields are only present in the first message.
diff --git a/ruby/lib/gitaly_server/wiki_service.rb b/ruby/lib/gitaly_server/wiki_service.rb
index ebc2012cc..b92cd34ff 100644
--- a/ruby/lib/gitaly_server/wiki_service.rb
+++ b/ruby/lib/gitaly_server/wiki_service.rb
@@ -97,37 +97,6 @@ module GitalyServer
       end
     end
 
-    def wiki_get_page_versions(request, call)
-      repo = Gitlab::Git::Repository.from_gitaly(request.repository, call)
-      wiki = Gollum::Wiki.new(repo.path)
-      path = set_utf8!(request.page_path)
-
-      page = wiki.paged(Gollum::Page.canonicalize_filename(path), File.split(path).first)
-
-      unless page
-        return Enumerator.new do |y|
-          y.yield Gitaly::WikiGetPageVersionsResponse.new(versions: [])
-        end
-      end
-
-      Enumerator.new do |y|
-        page.versions(per_page: request.per_page, page: request.page).each_slice(20) do |slice|
-          versions =
-            slice.map do |commit|
-              gollum_page = wiki.page(page.title, commit.id)
-              obj = repo.rugged.rev_parse(commit.id)
-
-              Gitaly::WikiPageVersion.new(
-                commit: gitaly_commit_from_rugged(obj),
-                format: gollum_page&.format.to_s
-              )
-            end
-
-          y.yield Gitaly::WikiGetPageVersionsResponse.new(versions: versions)
-        end
-      end
-    end
-
     def wiki_update_page(call)
       repo = wiki = title = format = page_path = commit_details = nil
       content = ""
diff --git a/ruby/proto/gitaly/wiki_pb.rb b/ruby/proto/gitaly/wiki_pb.rb
index fd0154fc4..b655a5299 100644
--- a/ruby/proto/gitaly/wiki_pb.rb
+++ b/ruby/proto/gitaly/wiki_pb.rb
@@ -28,15 +28,6 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
       optional :historical, :bool, 7
       optional :raw_data, :bytes, 8
     end
-    add_message "gitaly.WikiGetPageVersionsRequest" do
-      optional :repository, :message, 1, "gitaly.Repository"
-      optional :page_path, :bytes, 2
-      optional :page, :int32, 3
-      optional :per_page, :int32, 4
-    end
-    add_message "gitaly.WikiGetPageVersionsResponse" do
-      repeated :versions, :message, 1, "gitaly.WikiPageVersion"
-    end
     add_message "gitaly.WikiWritePageRequest" do
       optional :repository, :message, 1, "gitaly.Repository"
       optional :name, :bytes, 2
@@ -109,8 +100,6 @@ module Gitaly
   WikiCommitDetails = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.WikiCommitDetails").msgclass
   WikiPageVersion = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.WikiPageVersion").msgclass
   WikiPage = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.WikiPage").msgclass
-  WikiGetPageVersionsRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.WikiGetPageVersionsRequest").msgclass
-  WikiGetPageVersionsResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.WikiGetPageVersionsResponse").msgclass
   WikiWritePageRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.WikiWritePageRequest").msgclass
   WikiWritePageResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.WikiWritePageResponse").msgclass
   WikiUpdatePageRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.WikiUpdatePageRequest").msgclass
diff --git a/ruby/proto/gitaly/wiki_services_pb.rb b/ruby/proto/gitaly/wiki_services_pb.rb
index d90970ad9..d1cd1ceaa 100644
--- a/ruby/proto/gitaly/wiki_services_pb.rb
+++ b/ruby/proto/gitaly/wiki_services_pb.rb
@@ -14,7 +14,6 @@ module Gitaly
       self.unmarshal_class_method = :decode
       self.service_name = 'gitaly.WikiService'
 
-      rpc :WikiGetPageVersions, Gitaly::WikiGetPageVersionsRequest, stream(Gitaly::WikiGetPageVersionsResponse)
       rpc :WikiWritePage, stream(Gitaly::WikiWritePageRequest), Gitaly::WikiWritePageResponse
       rpc :WikiUpdatePage, stream(Gitaly::WikiUpdatePageRequest), Gitaly::WikiUpdatePageResponse
       rpc :WikiDeletePage, Gitaly::WikiDeletePageRequest, Gitaly::WikiDeletePageResponse