summaryrefslogtreecommitdiff
path: root/app/models/ci/build_metadata.rb
diff options
context:
space:
mode:
authorTomasz Maczukin <tomasz@maczukin.pl>2018-03-06 16:43:44 +0100
committerTomasz Maczukin <tomasz@maczukin.pl>2018-03-28 13:58:16 +0200
commit12401758a40868b1683c2c208d756105fd43de7b (patch)
treee99e8b5794a4565b34f7d47bc30eb1081981ed9c /app/models/ci/build_metadata.rb
parentd58d3098f159a17fbcf1ae27165c249722990988 (diff)
downloadgitlab-ce-12401758a40868b1683c2c208d756105fd43de7b.tar.gz
BuildMetadata styling improvements
Diffstat (limited to 'app/models/ci/build_metadata.rb')
-rw-r--r--app/models/ci/build_metadata.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/app/models/ci/build_metadata.rb b/app/models/ci/build_metadata.rb
index 335209e8ec2..424b6da1014 100644
--- a/app/models/ci/build_metadata.rb
+++ b/app/models/ci/build_metadata.rb
@@ -19,13 +19,13 @@ module Ci
}
def save_timeout_state!
- project_timeout = build.project&.build_timeout
- timeout = [project_timeout, build.runner&.maximum_timeout].compact.min
+ return unless build.runner.present?
- self.timeout = timeout
- self.timeout_source = timeout < project_timeout ? :runner_timeout_source : :project_timeout_source
+ project_timeout = build.project&.build_timeout
+ timeout = [project_timeout, build.runner.maximum_timeout].compact.min
+ timeout_source = timeout < project_timeout ? :runner_timeout_source : :project_timeout_source
- save!
+ update_attributes(timeout: timeout, timeout_source: timeout_source)
end
end
end