diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-02-07 16:34:44 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-02-07 16:34:44 +0000 |
| commit | 206a15d70e50e9873db316f83421a50538e7849e (patch) | |
| tree | 0ce48a76feeef31b97cf390e6b0e757fd47c4266 /lib | |
| parent | 683984f2e3e5ae72f375748ccfc5bfbf605911fa (diff) | |
| parent | d40912bb4944d0ac9adae45f7c0621f40b996406 (diff) | |
| download | gitlab-ce-206a15d70e50e9873db316f83421a50538e7849e.tar.gz | |
Merge branch 'fj-removing-disable-gitaly-flags' into 'master'
Removing gitaly flags
See merge request gitlab-org/gitlab-ce!16953
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/git/wiki.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/gitlab/git/wiki.rb b/lib/gitlab/git/wiki.rb index 39040d56971..ac12271a87e 100644 --- a/lib/gitlab/git/wiki.rb +++ b/lib/gitlab/git/wiki.rb @@ -25,9 +25,8 @@ module Gitlab @repository.exists? end - # Disabled because of https://gitlab.com/gitlab-org/gitaly/merge_requests/539 def write_page(name, format, content, commit_details) - @repository.gitaly_migrate(:wiki_write_page, status: Gitlab::GitalyClient::MigrationStatus::DISABLED) do |is_enabled| + @repository.gitaly_migrate(:wiki_write_page) do |is_enabled| if is_enabled gitaly_write_page(name, format, content, commit_details) gollum_wiki.clear_cache @@ -48,9 +47,8 @@ module Gitlab end end - # Disable because of https://gitlab.com/gitlab-org/gitlab-ce/issues/42094 def update_page(page_path, title, format, content, commit_details) - @repository.gitaly_migrate(:wiki_update_page, status: Gitlab::GitalyClient::MigrationStatus::DISABLED) do |is_enabled| + @repository.gitaly_migrate(:wiki_update_page) do |is_enabled| if is_enabled gitaly_update_page(page_path, title, format, content, commit_details) gollum_wiki.clear_cache |