Add latest changes from gitlab-org/gitlab@master

1 files changed, 17 insertions, 0 deletions

diff --git a/app/models/project_wiki.rb b/app/models/project_wiki.rb
index 5df0a33dc9a..bd570cf7ead 100644
--- a/app/models/project_wiki.rb
+++ b/app/models/project_wiki.rb
@@ -10,6 +10,23 @@ class ProjectWiki < Wiki
   def disk_path(*args, &block)
     container.disk_path + '.wiki'
   end
+
+  override :after_wiki_activity
+  def after_wiki_activity
+    # Update activity columns, this is done synchronously to avoid
+    # replication delays in Geo.
+    project.touch(:last_activity_at, :last_repository_updated_at)
+  end
+
+  override :after_post_receive
+  def after_post_receive
+    # Update storage statistics
+    ProjectCacheWorker.perform_async(project.id, [], [:wiki_size])
+
+    # This call is repeated for post-receive, to make sure we're updating
+    # the activity columns for Git pushes as well.
+    after_wiki_activity
+  end
 end
 
 # TODO: Remove this once we implement ES support for group wikis.