diff options
author | Robert Speicher <robert@gitlab.com> | 2015-11-23 21:51:51 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2015-11-23 21:51:51 +0000 |
commit | 2d77a21d5930ae3ed1a7e00c6c242569de2d55e5 (patch) | |
tree | b49ce54b6b9cf736be55526c12888a7eac41cfdc | |
parent | 148eb04a9aea92d031db789215aecc821c86f3b8 (diff) | |
parent | 62303bfad1268dbb466f0bfa68fef40958c6d287 (diff) | |
download | gitlab-ce-2d77a21d5930ae3ed1a7e00c6c242569de2d55e5.tar.gz |
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
-rw-r--r-- | CHANGELOG | 4 | ||||
-rw-r--r-- | app/models/ci/build.rb | 2 | ||||
-rw-r--r-- | app/models/project_services/gitlab_ci_service.rb | 1 | ||||
-rw-r--r-- | app/workers/stuck_ci_builds_worker.rb | 3 |
4 files changed, 10 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index fc7b6e75b1d..eb5badf6a96 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,6 +3,10 @@ Please view this file on the master branch, on stable branches it's out of date. v 8.3.0 (unreleased) - Fix: Assignee selector is empty when 'Unassigned' is selected (Jose Corcuera) +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 diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index e78b154084b..52ce1b920fa 100644 --- a/app/models/ci/build.rb +++ b/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? diff --git a/app/models/project_services/gitlab_ci_service.rb b/app/models/project_services/gitlab_ci_service.rb index 095d04e0df4..c5657b5070e 100644 --- a/app/models/project_services/gitlab_ci_service.rb +++ b/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 diff --git a/app/workers/stuck_ci_builds_worker.rb b/app/workers/stuck_ci_builds_worker.rb index ad02a3b16d9..4e5eddbaba1 100644 --- a/app/workers/stuck_ci_builds_worker.rb +++ b/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 |