diff options
author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-07-17 14:00:54 +0200 |
---|---|---|
committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-07-17 14:00:54 +0200 |
commit | a458534ba044bde60a4752187dabc58b438099b6 (patch) | |
tree | 22584c7077dbb43f38d16b39157a7e9d1821cfc4 | |
parent | b2d9869da51b6d98b12d89aa5a28b1c5d4184122 (diff) | |
download | gitlab-ce-runner-features.tar.gz |
Fix spec failuresrunner-features
-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 3370738a126..8f89cc6df54 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -339,7 +339,7 @@ module Ci end def runner_required_features - %w(variables) + [] end def merge_request @@ -591,7 +591,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 aa82f6557a3..8852f0121ca 100644 --- a/app/services/ci/register_job_service.rb +++ b/app/services/ci/register_job_service.rb @@ -79,7 +79,7 @@ module Ci end build.run! - return true + true end def builds_for_shared_runner |