summaryrefslogtreecommitdiff
path: root/app/presenters
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-09-16 18:06:05 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-09-16 18:06:05 +0000
commit930ff68c1efc380cb7522aa9b3884842eecb2486 (patch)
tree208f21205f9c8ee90e9722c6f641169d9a1569bf /app/presenters
parent84727c8209a4412e21111a07f99b0438b03232de (diff)
downloadgitlab-ce-930ff68c1efc380cb7522aa9b3884842eecb2486.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/presenters')
-rw-r--r--app/presenters/ci/build_metadata_presenter.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/presenters/ci/build_metadata_presenter.rb b/app/presenters/ci/build_metadata_presenter.rb
index 015b1f67db7..4871bb3a919 100644
--- a/app/presenters/ci/build_metadata_presenter.rb
+++ b/app/presenters/ci/build_metadata_presenter.rb
@@ -5,7 +5,8 @@ module Ci
TIMEOUT_SOURCES = {
unknown_timeout_source: nil,
project_timeout_source: 'project',
- runner_timeout_source: 'runner'
+ runner_timeout_source: 'runner',
+ job_timeout_source: 'job'
}.freeze
presents :metadata