diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-05-21 12:28:07 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-05-21 12:28:07 +0000 |
| commit | 98b0ca62c2c24acf0a0bb58a6857f383b3fc90ff (patch) | |
| tree | 08756e04c32ab9e4e0cd084048d69e58669bdd6f /app/models/ci/runner.rb | |
| parent | de3f89a4b6f7f4149e4bca681d68f73edeba6177 (diff) | |
| parent | 55e2ce762d52e680b45c9b87a238f993485f2866 (diff) | |
| download | gitlab-ce-98b0ca62c2c24acf0a0bb58a6857f383b3fc90ff.tar.gz | |
Merge branch '46082-runner-contacted_at-is-not-always-a-time-type' into 'master'
Resolve "Runner#contacted_at is not always a Time type"
Closes #46082
See merge request gitlab-org/gitlab-ce!18810
Diffstat (limited to 'app/models/ci/runner.rb')
| -rw-r--r-- | app/models/ci/runner.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/ci/runner.rb b/app/models/ci/runner.rb index e6f1ed519be..530eacf4be0 100644 --- a/app/models/ci/runner.rb +++ b/app/models/ci/runner.rb @@ -75,7 +75,7 @@ module Ci project_type: 3 } - cached_attr_reader :version, :revision, :platform, :architecture, :contacted_at, :ip_address + cached_attr_reader :version, :revision, :platform, :architecture, :ip_address, :contacted_at chronic_duration_attr :maximum_timeout_human_readable, :maximum_timeout |