summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2018-05-23 09:51:37 +0000
committerDouwe Maan <douwe@gitlab.com>2018-05-23 09:51:37 +0000
commit91f3930cc15a6696b443a8851d26e9a00b878f95 (patch)
tree8e69de647d19361d7bc86804191496332fa5952c
parent68b5cd71e0d8bdf39a71ad2dfd5de55f6b7aa91f (diff)
parentcb2a541027ab0ea5283855e19b92ef9f6e983f4d (diff)
downloadgitlab-ce-91f3930cc15a6696b443a8851d26e9a00b878f95.tar.gz
Merge branch 'gitaly-wiki-get-formatted-data-opt-out' into 'master'
Move Wiki::GetFormattedData to OptOut See merge request gitlab-org/gitlab-ce!19091
-rw-r--r--lib/gitlab/git/wiki.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/git/wiki.rb b/lib/gitlab/git/wiki.rb
index d75a5f15c29..1ab8c4e0229 100644
--- a/lib/gitlab/git/wiki.rb
+++ b/lib/gitlab/git/wiki.rb
@@ -131,7 +131,7 @@ module Gitlab
def page_formatted_data(title:, dir: nil, version: nil)
version = version&.id
- @repository.gitaly_migrate(:wiki_page_formatted_data) do |is_enabled|
+ @repository.gitaly_migrate(:wiki_page_formatted_data, status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) do |is_enabled|
if is_enabled
gitaly_wiki_client.get_formatted_data(title: title, dir: dir, version: version)
else