diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-05-11 10:50:07 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-05-11 10:50:07 +0000 |
| commit | 908aeebe917548aa6583f5837e1d9a73406dae0a (patch) | |
| tree | abad185f3b18f50796629b6855177b85054c5907 /lib | |
| parent | fa887f32d5facf84355ad00fe79eccc06019f726 (diff) | |
| parent | 4cf3a6094a85b0af240c880e85be4a7a96d45582 (diff) | |
| download | gitlab-ce-908aeebe917548aa6583f5837e1d9a73406dae0a.tar.gz | |
Merge branch 'zj-wiki-find-file-opt-out' into 'master'
Wiki Find Page to opt_out
Closes gitaly#894
See merge request gitlab-org/gitlab-ce!18895
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/git/wiki.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/gitlab/git/wiki.rb b/lib/gitlab/git/wiki.rb index 84a26fe4a6f..d75a5f15c29 100644 --- a/lib/gitlab/git/wiki.rb +++ b/lib/gitlab/git/wiki.rb @@ -67,7 +67,8 @@ module Gitlab end def page(title:, version: nil, dir: nil) - @repository.gitaly_migrate(:wiki_find_page) do |is_enabled| + @repository.gitaly_migrate(:wiki_find_page, + status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) do |is_enabled| if is_enabled gitaly_find_page(title: title, version: version, dir: dir) else |