summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2018-03-22 12:22:22 +0000
committerSean McGivern <sean@mcgivern.me.uk>2018-03-22 12:22:22 +0000
commitaf87f802746786c23d680aa1d85e89604d315932 (patch)
tree9c25f89b77e474a76296c951eb6484198d920f20
parent89de9bd8bc0ccdc814e68507b9f8a55350ebadc7 (diff)
parentd0a1da526e16e34421bfdb9728507b17b131ccb8 (diff)
downloadgitlab-ce-af87f802746786c23d680aa1d85e89604d315932.tar.gz
Merge branch 'fix/remove-wiki-cache-clear' into 'master'
Remove calls to clear_cache from Git::Wiki Closes gitaly#1095 See merge request gitlab-org/gitlab-ce!17914
-rw-r--r--lib/gitlab/git/wiki.rb3
1 files changed, 0 insertions, 3 deletions
diff --git a/lib/gitlab/git/wiki.rb b/lib/gitlab/git/wiki.rb
index 52b44b9b3c5..8d82820915d 100644
--- a/lib/gitlab/git/wiki.rb
+++ b/lib/gitlab/git/wiki.rb
@@ -29,7 +29,6 @@ module Gitlab
@repository.gitaly_migrate(:wiki_write_page) do |is_enabled|
if is_enabled
gitaly_write_page(name, format, content, commit_details)
- gollum_wiki.clear_cache
else
gollum_write_page(name, format, content, commit_details)
end
@@ -40,7 +39,6 @@ module Gitlab
@repository.gitaly_migrate(:wiki_delete_page) do |is_enabled|
if is_enabled
gitaly_delete_page(page_path, commit_details)
- gollum_wiki.clear_cache
else
gollum_delete_page(page_path, commit_details)
end
@@ -51,7 +49,6 @@ module Gitlab
@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
else
gollum_update_page(page_path, title, format, content, commit_details)
end