diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-05-02 16:07:50 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-05-02 16:07:50 +0000 |
| commit | adec373f46187c1be75dd5c748090afb55fb2b06 (patch) | |
| tree | 3fcf9734b52146db62167fbc886e9040a82f0978 /app/views/projects | |
| parent | e662cab54384a795c109073cee1ba177b34747e1 (diff) | |
| parent | ebcd5711c5ff937bf925002bf9a5b636b037684e (diff) | |
| download | gitlab-ce-adec373f46187c1be75dd5c748090afb55fb2b06.tar.gz | |
Merge branch '45761-replace-actionview-time_ago_in_words' into 'master'
Deprecation of ActionView's time_ago_in_words
Closes #45761
See merge request gitlab-org/gitlab-ce!18607
Diffstat (limited to 'app/views/projects')
| -rw-r--r-- | app/views/projects/jobs/_sidebar.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/registry/repositories/_tag.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/runners/show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/services/_index.html.haml | 3 | ||||
| -rw-r--r-- | app/views/projects/triggers/_trigger.html.haml | 2 |
5 files changed, 5 insertions, 6 deletions
diff --git a/app/views/projects/jobs/_sidebar.html.haml b/app/views/projects/jobs/_sidebar.html.haml index 7f0bef5ede0..826404c2008 100644 --- a/app/views/projects/jobs/_sidebar.html.haml +++ b/app/views/projects/jobs/_sidebar.html.haml @@ -15,7 +15,7 @@ - elsif @build.has_expiring_artifacts? %p.build-detail-row The artifacts will be removed in - %span= time_ago_in_words @build.artifacts_expire_at + %span= time_ago_with_tooltip @build.artifacts_expire_at - if @build.artifacts? .btn-group.btn-group-justified{ role: :group } diff --git a/app/views/projects/registry/repositories/_tag.html.haml b/app/views/projects/registry/repositories/_tag.html.haml index 0b082a2137f..0223372bff8 100644 --- a/app/views/projects/registry/repositories/_tag.html.haml +++ b/app/views/projects/registry/repositories/_tag.html.haml @@ -18,7 +18,7 @@ \- %td - if tag.created_at - = time_ago_in_words(tag.created_at) + = time_ago_with_tooltip tag.created_at - else .light \- diff --git a/app/views/projects/runners/show.html.haml b/app/views/projects/runners/show.html.haml index f33e7e25b68..322152cfaca 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_in_words(@runner.contacted_at)} ago + = time_ago_with_tooltip @runner.contacted_at - else Never diff --git a/app/views/projects/services/_index.html.haml b/app/views/projects/services/_index.html.haml index 915c6b22162..dac7d4d1bbb 100644 --- a/app/views/projects/services/_index.html.haml +++ b/app/views/projects/services/_index.html.haml @@ -27,5 +27,4 @@ = service.description %td.light - if service.updated_at.present? - = time_ago_in_words service.updated_at - ago + = time_ago_with_tooltip service.updated_at diff --git a/app/views/projects/triggers/_trigger.html.haml b/app/views/projects/triggers/_trigger.html.haml index 6249c32b7cc..9201680f119 100644 --- a/app/views/projects/triggers/_trigger.html.haml +++ b/app/views/projects/triggers/_trigger.html.haml @@ -25,7 +25,7 @@ %td - if trigger.last_used - #{time_ago_in_words(trigger.last_used)} ago + = time_ago_with_tooltip trigger.last_used - else Never |