diff options
| author | Tomasz Maczukin <tomasz@maczukin.pl> | 2018-03-06 16:14:23 +0100 |
|---|---|---|
| committer | Tomasz Maczukin <tomasz@maczukin.pl> | 2018-03-28 13:58:15 +0200 |
| commit | f5e602ee0f8d95617adf6fb9b5a1a132a471fb12 (patch) | |
| tree | 00e285a8a41fcca51d7b105e4db9837d421b8257 /app/models/ci | |
| parent | 1e138767a652d86458d38665b98c9c2e5d4c3cb8 (diff) | |
| download | gitlab-ce-f5e602ee0f8d95617adf6fb9b5a1a132a471fb12.tar.gz | |
Rename maximum_job_timeout to maximum_timeout
Diffstat (limited to 'app/models/ci')
| -rw-r--r-- | app/models/ci/build_metadata.rb | 2 | ||||
| -rw-r--r-- | app/models/ci/runner.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/models/ci/build_metadata.rb b/app/models/ci/build_metadata.rb index 9043bed86bf..89fee37b1b6 100644 --- a/app/models/ci/build_metadata.rb +++ b/app/models/ci/build_metadata.rb @@ -20,7 +20,7 @@ module Ci def save_timeout_state! project_timeout = build.project&.build_timeout - timeout = [project_timeout, build.runner&.maximum_job_timeout].compact.min + timeout = [project_timeout, build.runner&.maximum_timeout].compact.min self.used_timeout = timeout self.timeout_source = timeout < project_timeout ? :runner_timeout_source : :project_timeout_source diff --git a/app/models/ci/runner.rb b/app/models/ci/runner.rb index 413607e0eff..62cc636db22 100644 --- a/app/models/ci/runner.rb +++ b/app/models/ci/runner.rb @@ -9,7 +9,7 @@ module Ci ONLINE_CONTACT_TIMEOUT = 1.hour UPDATE_DB_RUNNER_INFO_EVERY = 40.minutes AVAILABLE_SCOPES = %w[specific shared active paused online].freeze - FORM_EDITABLE = %i[description tag_list active run_untagged locked access_level maximum_job_timeout_human_readable].freeze + FORM_EDITABLE = %i[description tag_list active run_untagged locked access_level maximum_timeout_human_readable].freeze has_many :builds has_many :runner_projects, dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent @@ -52,7 +52,7 @@ module Ci cached_attr_reader :version, :revision, :platform, :architecture, :contacted_at, :ip_address - chronic_duration_attr :maximum_job_timeout_human_readable, :maximum_job_timeout + chronic_duration_attr :maximum_timeout_human_readable, :maximum_timeout # Searches for runners matching the given query. # |