Run `Ci::Runner#assign_to` in transaction

1 files changed, 9 insertions, 2 deletions

diff --git a/app/models/ci/runner.rb b/app/models/ci/runner.rb
index 3f0476fb7cf..57edd6a4956 100644
--- a/app/models/ci/runner.rb
+++ b/app/models/ci/runner.rb
@@ -120,8 +120,15 @@ module Ci
         raise ArgumentError, 'Transitioning a group runner to a project runner is not supported'
       end
 
-      self.projects << project
-      self.save
+      begin
+        transaction do
+          self.projects << project
+          self.save!
+        end
+      rescue ActiveRecord::RecordInvalid => e
+        self.errors.add(:assign_to, e.message)
+        false
+      end
     end
 
     def display_name