Add latest changes from gitlab-org/gitlab@master

1 files changed, 9 insertions, 0 deletions

diff --git a/app/services/git/wiki_push_service.rb b/app/services/git/wiki_push_service.rb
index 87e2be858c0..99659bc8ab2 100644
--- a/app/services/git/wiki_push_service.rb
+++ b/app/services/git/wiki_push_service.rb
@@ -16,6 +16,7 @@ module Git
       wiki.after_post_receive
 
       process_changes
+      perform_housekeeping if Feature.enabled?(:wiki_housekeeping, wiki.container)
     end
 
     private
@@ -72,6 +73,14 @@ module Git
     def default_branch_changes
       @default_branch_changes ||= changes.select { |change| on_default_branch?(change) }
     end
+
+    def perform_housekeeping
+      housekeeping = Repositories::HousekeepingService.new(wiki)
+      housekeeping.increment!
+      housekeeping.execute if housekeeping.needed?
+    rescue Repositories::HousekeepingService::LeaseTaken
+      # no-op
+    end
   end
 end