diff options
| author | Tomasz Maczukin <tomasz@maczukin.pl> | 2018-03-26 19:26:52 +0200 |
|---|---|---|
| committer | Tomasz Maczukin <tomasz@maczukin.pl> | 2018-03-28 14:00:05 +0200 |
| commit | 6ecde0076afa83e30608ea9caba924bbab66a123 (patch) | |
| tree | 0bf675fb79bdf752afb0ed4e6765c7d9800cfc13 /lib | |
| parent | 403decbbad26bea620125aed34b440a9b6611172 (diff) | |
| download | gitlab-ce-6ecde0076afa83e30608ea9caba924bbab66a123.tar.gz | |
Remove Ci::Build#timeout
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/entities.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/ci/build/step.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 324e14f5654..38161d1f127 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -1120,7 +1120,7 @@ module API end class RunnerInfo < Grape::Entity - expose :timeout + expose :metadata_timeout, as: :timeout end class Step < Grape::Entity diff --git a/lib/gitlab/ci/build/step.rb b/lib/gitlab/ci/build/step.rb index 411f67f8ce7..0b1ebe4e048 100644 --- a/lib/gitlab/ci/build/step.rb +++ b/lib/gitlab/ci/build/step.rb @@ -14,7 +14,7 @@ module Gitlab self.new(:script).tap do |step| step.script = job.options[:before_script].to_a + job.options[:script].to_a step.script = job.commands.split("\n") if step.script.empty? - step.timeout = job.timeout + step.timeout = job.metadata_timeout step.when = WHEN_ON_SUCCESS end end @@ -25,7 +25,7 @@ module Gitlab self.new(:after_script).tap do |step| step.script = after_script - step.timeout = job.timeout + step.timeout = job.metadata_timeout step.when = WHEN_ALWAYS step.allow_failure = true end |