diff options
| author | Matija Čupić <matteeyah@gmail.com> | 2018-01-29 22:38:09 +0100 |
|---|---|---|
| committer | Matija Čupić <matteeyah@gmail.com> | 2018-01-29 22:38:09 +0100 |
| commit | b88103e4075678d032d7d7350caaece4a3091328 (patch) | |
| tree | 487b3d7cd5108daef54276039e647512fc5b4c65 | |
| parent | df2554558123fbfec007418601e2074cf251db46 (diff) | |
| download | gitlab-ce-b88103e4075678d032d7d7350caaece4a3091328.tar.gz | |
Expose Ci::Runner#cached_contacted_at as Time
| -rw-r--r-- | app/models/ci/runner.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/models/ci/runner.rb b/app/models/ci/runner.rb index 8fe20622723..7cf36c0bfe0 100644 --- a/app/models/ci/runner.rb +++ b/app/models/ci/runner.rb @@ -69,7 +69,11 @@ module Ci end def cached_contacted_at - runner_info_cache(:contacted_at) || self.contacted_at + if runner_info_cache(:contacted_at) + Time.zone.parse(runner_info_cache(:contacted_at)) + else + self.contacted_at + end end def set_default_values |