Merge branch 'fix-runner-pages-errors' into 'master'

Partially revert ebcd5711c5 to fix runner pages See merge request gitlab-org/gitlab-ce!18763
2018-05-06 13:40:44 +00:00 · 2018-05-06 13:40:44 +00:00 · 927a9b13f0
parent 5e798f25da b14719ea04
commit 927a9b13f0
2 changed files with 2 additions and 2 deletions
--- a/app/views/admin/runners/_runner.html.haml
+++ b/app/views/admin/runners/_runner.html.haml
@ -33,7 +33,7 @@
        = tag
  %td
    - if runner.contacted_at
-      = time_ago_with_tooltip runner.contacted_at
+      #{time_ago_in_words(runner.contacted_at)} ago
    - else
      Never
  %td.admin-runner-btn-group-cell
--- a/app/views/projects/runners/show.html.haml
+++ b/app/views/projects/runners/show.html.haml
@ -62,6 +62,6 @@
      %td Last contact
      %td
        - if @runner.contacted_at
-          = time_ago_with_tooltip @runner.contacted_at
+          #{time_ago_in_words(@runner.contacted_at)} ago
        - else
          Never