diff options
| author | Tomasz Maczukin <tomasz@maczukin.pl> | 2018-02-21 01:21:59 +0100 |
|---|---|---|
| committer | Tomasz Maczukin <tomasz@maczukin.pl> | 2018-03-28 13:55:46 +0200 |
| commit | d633bc8134fe472137fb668c1eb78de45dc9bb57 (patch) | |
| tree | d50c6d3a4bceb0bda5a20b05820bf9efb37b5b40 /lib/api | |
| parent | a4ea9a93db98461479dcb8e1d7b8425a77018f1e (diff) | |
| download | gitlab-ce-d633bc8134fe472137fb668c1eb78de45dc9bb57.tar.gz | |
Rename job_upper_timeout to maximum_job_timeout
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/entities.rb | 2 | ||||
| -rw-r--r-- | lib/api/runner.rb | 4 | ||||
| -rw-r--r-- | lib/api/runners.rb | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index becd4f22a03..bb18fa00dc6 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -951,7 +951,7 @@ module API expose :tag_list expose :run_untagged expose :locked - expose :job_upper_timeout + expose :maximum_job_timeout expose :access_level expose :version, :revision, :platform, :architecture expose :contacted_at diff --git a/lib/api/runner.rb b/lib/api/runner.rb index 14dd3b81dd0..3a26155be6d 100644 --- a/lib/api/runner.rb +++ b/lib/api/runner.rb @@ -14,10 +14,10 @@ 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 :job_upper_timeout, type: Integer, desc: 'Upper timeout set when this Runner will handle the job' + optional :maximum_job_timeout, type: Integer, desc: 'Maximum timeout set when this Runner will handle the job' end post '/' do - attributes = attributes_for_keys([:description, :locked, :run_untagged, :tag_list, :job_upper_timeout]) + attributes = attributes_for_keys([:description, :locked, :run_untagged, :tag_list, :maximum_job_timeout]) .merge(get_runner_details_from_request) runner = diff --git a/lib/api/runners.rb b/lib/api/runners.rb index bc91b7cfd54..b3037235353 100644 --- a/lib/api/runners.rb +++ b/lib/api/runners.rb @@ -57,7 +57,7 @@ module API optional :locked, type: Boolean, desc: 'Flag indicating the runner is locked' optional :access_level, type: String, values: Ci::Runner.access_levels.keys, desc: 'The access_level of the runner' - optional :job_upper_timeout, type: Integer, desc: 'Upper timeout set when this Runner will handle the job' + optional :maximum_job_timeout, type: Integer, desc: 'Maximum timeout set when this Runner will handle the job' at_least_one_of :description, :active, :tag_list, :run_untagged, :locked, :access_level end put ':id' do |