Merge branch 'ci-fix-500' into 'master'

Fix 500 when using CI

- Fix for Ci::Build state machine, allowing to process builds without the project
- Forcefully update builds that didn't want to update with state machine
- Fix saving GitLabCiService as Admin Template

Fixes #3556 

See merge request !1873

CHANGELOG

@@ -2,6 +2,10 @@ Please view this file on the master branch, on stable branches it's out of date.
 v 8.3.0 (unreleased)
+v 8.2.1
+  - Forcefully update builds that didn't want to update with state machine
+  - Fix: saving GitLabCiService as Admin Template
+
 v 8.2.0
   - Improved performance of finding projects and groups in various places
   - Improved performance of rendering user profile pages and Atom feeds

app/models/ci/build.rb

@@ -97,6 +97,8 @@ module Ci
     state_machine :status, initial: :pending do
       after_transition any => [:success, :failed, :canceled] do |build, transition|
+        return unless build.gl_project
+
         project = build.project
         if project.web_hooks?

app/models/project_services/gitlab_ci_service.rb

@@ -30,6 +30,7 @@ class GitlabCiService < CiService
   end
   def ensure_gitlab_ci_project
+    return unless project
     project.ensure_gitlab_ci_project
   end

app/workers/stuck_ci_builds_worker.rb

@@ -14,5 +14,8 @@ class StuckCiBuildsWorker
       Rails.logger.debug "Dropping stuck #{build.status} build #{build.id} for runner #{build.runner_id}"
       build.drop
     end
+
+    # Update builds that failed to drop
+    builds.update_all(status: 'failed')
   end
 end