diff options
| author | DJ Mountney <david@twkie.net> | 2018-10-29 14:37:19 -0700 |
|---|---|---|
| committer | DJ Mountney <david@twkie.net> | 2018-10-29 14:37:19 -0700 |
| commit | 06b6daacb15b92b04e05538b37aadfdb04fc5a4b (patch) | |
| tree | 0500cf47f7d8d2e6bc7ed53cbf9ad957f07fb31a /lib/gitlab/ci | |
| parent | c847f172d25efc211045c363f4e55402ad250c09 (diff) | |
| parent | 45b61a9ece48550f51432c8cca7de7e1a298ca08 (diff) | |
| download | gitlab-ce-06b6daacb15b92b04e05538b37aadfdb04fc5a4b.tar.gz | |
Merge remote-tracking branch 'origin/master' into dev-master
Diffstat (limited to 'lib/gitlab/ci')
| -rw-r--r-- | lib/gitlab/ci/status/build/failed.rb | 3 | ||||
| -rw-r--r-- | lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/gitlab/ci/status/build/failed.rb b/lib/gitlab/ci/status/build/failed.rb index 50b0d044265..4babc23a495 100644 --- a/lib/gitlab/ci/status/build/failed.rb +++ b/lib/gitlab/ci/status/build/failed.rb @@ -11,7 +11,8 @@ module Gitlab runner_system_failure: 'runner system failure', missing_dependency_failure: 'missing dependency failure', runner_unsupported: 'unsupported runner', - stale_schedule: 'stale schedule' + stale_schedule: 'stale schedule', + job_execution_timeout: 'job execution timeout' }.freeze private_constant :REASONS diff --git a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml index 6fa59e41d20..db48b187e5e 100644 --- a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml @@ -210,7 +210,7 @@ container_scanning: refs: - branches variables: - - $GITLAB_FEATURES =~ /\bsast_container\b/ + - $GITLAB_FEATURES =~ /\bcontainer_scanning\b/ except: variables: - $CONTAINER_SCANNING_DISABLED |