Add latest changes from gitlab-org/gitlab@master

2 files changed, 9 insertions, 8 deletions

diff --git a/app/services/git/branch_push_service.rb b/app/services/git/branch_push_service.rb
index 5bf39d98fa3..13223872e4f 100644
--- a/app/services/git/branch_push_service.rb
+++ b/app/services/git/branch_push_service.rb
@@ -26,7 +26,6 @@ module Git
       enqueue_detect_repository_languages
 
       execute_related_hooks
-      perform_housekeeping
 
       stop_environments
       unlock_artifacts
@@ -71,13 +70,6 @@ module Git
       BranchHooksService.new(project, current_user, params).execute
     end
 
-    def perform_housekeeping
-      housekeeping = Repositories::HousekeepingService.new(project)
-      housekeeping.increment!
-      housekeeping.execute if housekeeping.needed?
-    rescue Repositories::HousekeepingService::LeaseTaken
-    end
-
     def removing_branch?
       Gitlab::Git.blank_ref?(newrev)
     end
diff --git a/app/services/git/process_ref_changes_service.rb b/app/services/git/process_ref_changes_service.rb
index da05f18b5ac..d4081fc149b 100644
--- a/app/services/git/process_ref_changes_service.rb
+++ b/app/services/git/process_ref_changes_service.rb
@@ -9,6 +9,8 @@ module Git
 
       process_changes_by_action(:branch, changes.branch_changes)
       process_changes_by_action(:tag, changes.tag_changes)
+
+      perform_housekeeping
     end
 
     private
@@ -83,5 +85,12 @@ module Git
 
       MergeRequests::PushedBranchesService.new(project: project, current_user: current_user, params: { changes: changes }).execute
     end
+
+    def perform_housekeeping
+      housekeeping = Repositories::HousekeepingService.new(project)
+      housekeeping.increment!
+      housekeeping.execute if housekeeping.needed?
+    rescue Repositories::HousekeepingService::LeaseTaken
+    end
   end
 end