diff options
| author | Dylan Griffith <dyl.griffith@gmail.com> | 2018-05-04 14:16:41 +0200 |
|---|---|---|
| committer | Dylan Griffith <dyl.griffith@gmail.com> | 2018-05-04 14:16:41 +0200 |
| commit | b14719ea04f29888e2bbbdccda872d3cb4e70ae7 (patch) | |
| tree | 6a1d3fd677c2513c701d7c7a2bece9758df34a4e | |
| parent | 4cfa8168a204b42d2982a6817c9ba6c960ae62b3 (diff) | |
| download | gitlab-ce-b14719ea04f29888e2bbbdccda872d3cb4e70ae7.tar.gz | |
Partially revert ebcd5711c5ff937bf925002bf9a5b636b037684e to fix runner pages
As described in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18738 there is a problem and the larger fix may take longer so we can just revert this small change for now
| -rw-r--r-- | app/views/admin/runners/_runner.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/runners/show.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/admin/runners/_runner.html.haml b/app/views/admin/runners/_runner.html.haml index 99fbbaec487..6e76e7c2768 100644 --- 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 diff --git a/app/views/projects/runners/show.html.haml b/app/views/projects/runners/show.html.haml index 322152cfaca..f33e7e25b68 100644 --- 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 |