diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-01-04 14:42:16 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-01-04 14:42:16 +0000 |
| commit | 9a55421ba1f93f2aea8555618773bbaa73454613 (patch) | |
| tree | 6627d37295ba9413b63b093a12ca36f8a39eba05 /app/models/ci | |
| parent | d5fe3d7f6dcb1ce7d2ca90757199257b8be101c2 (diff) | |
| parent | bcaf444b2107408b1eaf66bfc0d869b7b87b35f9 (diff) | |
| download | gitlab-ce-9a55421ba1f93f2aea8555618773bbaa73454613.tar.gz | |
Merge branch 'contacted_at' into 'master'
Guarantee visually correct order of runners on the "Admin Area > Runners" page
Closes #49791
See merge request gitlab-org/gitlab-ce!21627
Diffstat (limited to 'app/models/ci')
| -rw-r--r-- | app/models/ci/runner.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/models/ci/runner.rb b/app/models/ci/runner.rb index 8249199e76f..5aae31de6e2 100644 --- a/app/models/ci/runner.rb +++ b/app/models/ci/runner.rb @@ -256,6 +256,10 @@ module Ci end end + def uncached_contacted_at + read_attribute(:contacted_at) + end + private def cleanup_runner_queue |