summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorTomasz Maczukin <tomasz@maczukin.pl>2018-03-05 17:49:40 +0100
committerTomasz Maczukin <tomasz@maczukin.pl>2018-03-28 13:57:41 +0200
commit62f053e4e50dd04933d49622a74dcb89ebe8174e (patch)
treec1fdd2206fff93531d78267cc6edc9dc4d1a9622 /lib
parentd02694c5c53265ccd9e8a51a52dc8bb8bcbff656 (diff)
downloadgitlab-ce-62f053e4e50dd04933d49622a74dcb89ebe8174e.tar.gz
Update runner registration API
Diffstat (limited to 'lib')
-rw-r--r--lib/api/runner.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/api/runner.rb b/lib/api/runner.rb
index 74ddaf26bb6..73d5993701c 100644
--- a/lib/api/runner.rb
+++ b/lib/api/runner.rb
@@ -14,11 +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_human_readable, type: String, desc: 'Maximum timeout set when this Runner will handle the job'
+ optional :maximum_job_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, :maximum_job_timeout_human_readable])
+ 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])
runner =
if runner_registration_token_valid?