Add latest changes from gitlab-org/gitlab@master

1 files changed, 9 insertions, 0 deletions

diff --git a/app/services/groups/update_shared_runners_service.rb b/app/services/groups/update_shared_runners_service.rb
index 639c5bf6ae0..eb6b46a5613 100644
--- a/app/services/groups/update_shared_runners_service.rb
+++ b/app/services/groups/update_shared_runners_service.rb
@@ -8,6 +8,7 @@ module Groups
       validate_params
 
       update_shared_runners
+      update_pending_builds!
 
       success
 
@@ -26,5 +27,13 @@ module Groups
     def update_shared_runners
       group.update_shared_runners_setting!(params[:shared_runners_setting])
     end
+
+    def update_pending_builds!
+      return unless group.previous_changes.include?('shared_runners_enabled')
+
+      update_params = { instance_runners_enabled: group.shared_runners_enabled }
+
+      ::Ci::UpdatePendingBuildService.new(group, update_params).execute
+    end
   end
 end