Merge branch '10-8-stable-prepare-rc8-fix-conflict-for-18874' into '10-8-stable-prepare-rc8'

Fixes conflict when picking into prep branch

See merge request gitlab-org/gitlab-ce!18900

1 files changed, 7 insertions, 1 deletions

diff --git a/app/models/ci/runner.rb b/app/models/ci/runner.rb
index 23078f1c3ed..9b76817b4c8 100644
--- a/app/models/ci/runner.rb
+++ b/app/models/ci/runner.rb
@@ -107,7 +107,13 @@ module Ci
     end
 
     def assign_to(project, current_user = nil)
-      self.is_shared = false if shared?
+      if shared?
+        self.is_shared = false if shared?
+        self.runner_type = :project_type
+      elsif group_type?
+        raise ArgumentError, 'Transitioning a group runner to a project runner is not supported'
+      end
+
       self.save
       project.runner_projects.create(runner_id: self.id)
     end