diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-02-28 15:27:19 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-02-28 15:27:19 +0000 |
| commit | a2a48581a1bf5f59f0ba6116592887e252890e54 (patch) | |
| tree | e00769433293e3e3a05653ef7d6bb49321ce48f5 | |
| parent | 01b8d4bdda9568d458e3c0c94c5fcbc2c49b7b71 (diff) | |
| parent | 17b91050ba2a1729fc8b03da0e8c6f5de761012c (diff) | |
| download | gitlab-ce-a2a48581a1bf5f59f0ba6116592887e252890e54.tar.gz | |
Merge branch 'gitaly-reenable-wiki' into 'master'
Re-enable the remaning Wiki Gitaly-Endpoints
See merge request gitlab-org/gitlab-ce!17422
| -rw-r--r-- | lib/gitlab/git/wiki.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/gitlab/git/wiki.rb b/lib/gitlab/git/wiki.rb index ac12271a87e..52b44b9b3c5 100644 --- a/lib/gitlab/git/wiki.rb +++ b/lib/gitlab/git/wiki.rb @@ -59,7 +59,7 @@ module Gitlab end def pages(limit: nil) - @repository.gitaly_migrate(:wiki_get_all_pages, status: Gitlab::GitalyClient::MigrationStatus::DISABLED) do |is_enabled| + @repository.gitaly_migrate(:wiki_get_all_pages) do |is_enabled| if is_enabled gitaly_get_all_pages else @@ -68,9 +68,8 @@ module Gitlab end end - # Disable because of https://gitlab.com/gitlab-org/gitlab-ce/issues/42039 def page(title:, version: nil, dir: nil) - @repository.gitaly_migrate(:wiki_find_page, status: Gitlab::GitalyClient::MigrationStatus::DISABLED) do |is_enabled| + @repository.gitaly_migrate(:wiki_find_page) do |is_enabled| if is_enabled gitaly_find_page(title: title, version: version, dir: dir) else |