Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomasz Maczukin <tomasz@maczukin.pl>2018-03-01 05:12:32 +0300
committerTomasz Maczukin <tomasz@maczukin.pl>2018-03-28 14:57:40 +0300
commit1dde609ca6b130aa0a3d39e929edee7e770e62fc (patch)
tree5cd6b85eaf9c49e7c14aa23c5c2aa5814f1d955b /app/presenters
parentd34e937b93b103435a59e6759a9f30e9f8addc11 (diff)
Move job timeout information to new ci_builds_metadata table
Diffstat (limited to 'app/presenters')
-rw-r--r--app/presenters/ci/build_metadata_presenter.rb20
-rw-r--r--app/presenters/ci/build_presenter.rb13
2 files changed, 20 insertions, 13 deletions
diff --git a/app/presenters/ci/build_metadata_presenter.rb b/app/presenters/ci/build_metadata_presenter.rb
new file mode 100644
index 00000000000..e80eb19ea19
--- /dev/null
+++ b/app/presenters/ci/build_metadata_presenter.rb
@@ -0,0 +1,20 @@
+module Ci
+ class BuildMetadataPresenter < Gitlab::View::Presenter::Delegated
+
+ TIMEOUT_SOURCES = {
+ unknown_timeout_source: nil,
+ project_timeout_source: 'project',
+ runner_timeout_source: 'runner'
+ }.freeze
+
+ presents :metadata
+
+ def timeout_source
+ return unless metadata.timeout_source?
+
+ TIMEOUT_SOURCES[metadata.timeout_source.to_sym] ||
+ metadata.timeout_source
+ end
+
+ end
+end
diff --git a/app/presenters/ci/build_presenter.rb b/app/presenters/ci/build_presenter.rb
index be6cc2e70b1..9345e5069bc 100644
--- a/app/presenters/ci/build_presenter.rb
+++ b/app/presenters/ci/build_presenter.rb
@@ -1,12 +1,6 @@
module Ci
class BuildPresenter < Gitlab::View::Presenter::Delegated
- TIMEOUT_SOURCES = {
- unknown_timeout_source: nil,
- project_timeout_source: 'project',
- runner_timeout_source: 'runner'
- }.freeze
-
presents :build
def erased_by_user?
@@ -25,13 +19,6 @@ module Ci
end
end
- def timeout_source
- return unless build.timeout_source?
-
- TIMEOUT_SOURCES[build.timeout_source.to_sym] ||
- build.timeout_source
- end
-
def trigger_variables
return [] unless trigger_request