diff options
author | Robert Speicher <robert@gitlab.com> | 2018-01-30 20:47:23 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2018-01-30 20:47:23 +0000 |
commit | 95b4f7ea37d641c7c30e9903dd3390a7d04a6e67 (patch) | |
tree | 9abac8cc851f8249a0b0279f1406d8f6fe9cdaad /lib/gitlab/gitaly_client | |
parent | a20e02a5bc2e52f679ee220f61abeb9ecfff1ec9 (diff) | |
parent | fa9d47f221fff4d75e3c50670aeeac7a3d675f7a (diff) | |
download | gitlab-ce-95b4f7ea37d641c7c30e9903dd3390a7d04a6e67.tar.gz |
Merge branch 'feature/migrate-wiki-page-formatted-data-to-gitaly' into 'master'
Migrate fetching wiki page formatted content to Gitaly
Closes gitaly#958
See merge request gitlab-org/gitlab-ce!16716
Diffstat (limited to 'lib/gitlab/gitaly_client')
-rw-r--r-- | lib/gitlab/gitaly_client/wiki_service.rb | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/lib/gitlab/gitaly_client/wiki_service.rb b/lib/gitlab/gitaly_client/wiki_service.rb index 5c5b170a3e0..8e87a8cc36f 100644 --- a/lib/gitlab/gitaly_client/wiki_service.rb +++ b/lib/gitlab/gitaly_client/wiki_service.rb @@ -127,6 +127,18 @@ module Gitlab wiki_file end + def get_formatted_data(title:, dir: nil, version: nil) + request = Gitaly::WikiGetFormattedDataRequest.new( + repository: @gitaly_repo, + title: encode_binary(title), + revision: encode_binary(version), + directory: encode_binary(dir) + ) + + response = GitalyClient.call(@repository.storage, :wiki_service, :wiki_get_formatted_data, request) + response.reduce("") { |memo, msg| memo << msg.data } + end + private # If a block is given and the yielded value is true, iteration will be |