summaryrefslogtreecommitdiff
path: root/lib/api/runner.rb
diff options
context:
space:
mode:
authorTomasz Maczukin <tomasz@maczukin.pl>2018-03-06 16:14:23 +0100
committerTomasz Maczukin <tomasz@maczukin.pl>2018-03-28 13:58:15 +0200
commitf5e602ee0f8d95617adf6fb9b5a1a132a471fb12 (patch)
tree00e285a8a41fcca51d7b105e4db9837d421b8257 /lib/api/runner.rb
parent1e138767a652d86458d38665b98c9c2e5d4c3cb8 (diff)
downloadgitlab-ce-f5e602ee0f8d95617adf6fb9b5a1a132a471fb12.tar.gz
Rename maximum_job_timeout to maximum_timeout
Diffstat (limited to 'lib/api/runner.rb')
-rw-r--r--lib/api/runner.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/runner.rb b/lib/api/runner.rb
index 73d5993701c..95f57e6402d 100644
--- a/lib/api/runner.rb
+++ b/lib/api/runner.rb
@@ -14,12 +14,12 @@ module API
optional :locked, type: Boolean, desc: 'Should Runner be locked for current project'
optional :run_untagged, type: Boolean, desc: 'Should Runner handle untagged jobs'
optional :tag_list, type: Array[String], desc: %q(List of Runner's tags)
- optional :maximum_job_timeout, type: String, desc: 'Maximum timeout set when this Runner will handle the job'
+ optional :maximum_timeout, type: String, desc: 'Maximum timeout set when this Runner will handle the job'
end
post '/' do
attributes = attributes_for_keys([:description, :locked, :run_untagged, :tag_list])
.merge(get_runner_details_from_request)
- .merge(maximum_job_timeout_human_readable: params[:maximum_job_timeout])
+ .merge(maximum_timeout_human_readable: params[:maximum_timeout])
runner =
if runner_registration_token_valid?