diff options
| -rw-r--r-- | app/models/ci/build.rb | 4 | ||||
| -rw-r--r-- | app/models/commit_status.rb | 2 | ||||
| -rw-r--r-- | app/services/ci/register_job_service.rb | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index 5a6af97af62..9f0e156471f 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -340,7 +340,7 @@ module Ci end def runner_required_features - %w(variables) + [] end def merge_request @@ -598,7 +598,7 @@ module Ci def supported_runner?(features) runner_required_features.all? do |feature_name| - features[feature_name] + features&.dig(feature_name) end end diff --git a/app/models/commit_status.rb b/app/models/commit_status.rb index 638237498ae..8b1093655b7 100644 --- a/app/models/commit_status.rb +++ b/app/models/commit_status.rb @@ -47,7 +47,7 @@ class CommitStatus < ActiveRecord::Base stuck_or_timeout_failure: 3, runner_system_failure: 4, missing_dependency_failure: 5, - runner_unsupported: 6, + runner_unsupported: 6 } ## diff --git a/app/services/ci/register_job_service.rb b/app/services/ci/register_job_service.rb index 51af39e52a1..a6fddf3b7e4 100644 --- a/app/services/ci/register_job_service.rb +++ b/app/services/ci/register_job_service.rb @@ -81,7 +81,7 @@ module Ci end build.run! - return true + true end def builds_for_shared_runner |