Add latest changes from gitlab-org/gitlab@master

2 files changed, 17 insertions, 0 deletions

diff --git a/app/models/ci/runner.rb b/app/models/ci/runner.rb
index f3fbfe8193b..5fb982ee21e 100644
--- a/app/models/ci/runner.rb
+++ b/app/models/ci/runner.rb
@@ -464,6 +464,21 @@ module Ci
       end
     end
 
+    def clear_heartbeat
+      cleared_attributes = {
+        version: nil,
+        revision: nil,
+        platform: nil,
+        architecture: nil,
+        ip_address: nil,
+        executor_type: nil,
+        config: {},
+        contacted_at: nil
+      }
+      merge_cache_attributes(cleared_attributes)
+      update_columns(cleared_attributes)
+    end
+
     def pick_build!(build)
       tick_runner_queue if matches_build?(build)
     end
diff --git a/app/services/ci/runners/unregister_runner_manager_service.rb b/app/services/ci/runners/unregister_runner_manager_service.rb
index ecf6aba09c7..9b3bd4a53e2 100644
--- a/app/services/ci/runners/unregister_runner_manager_service.rb
+++ b/app/services/ci/runners/unregister_runner_manager_service.rb
@@ -20,6 +20,8 @@ module Ci
         runner_manager = runner.runner_managers.find_by_system_xid!(system_id)
         runner_manager.destroy!
 
+        runner.clear_heartbeat if runner.runner_managers.empty?
+
         ServiceResponse.success
       end