diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2018-01-17 07:26:56 +0000 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2018-01-17 07:26:56 +0000 |
| commit | 73cb6c3e717f3aa4979003552e00c715c052241a (patch) | |
| tree | d27aa9bbba23108b7cfdf5f28dbcdaffa6d079db /app/views/projects | |
| parent | a8e11414777b986f7280bdaf83c7caad9a566eee (diff) | |
| parent | 3f1235a17cf420ed2a1c830c4030b1a062039c51 (diff) | |
| download | gitlab-ce-73cb6c3e717f3aa4979003552e00c715c052241a.tar.gz | |
Merge branch '41929-artifacts-time' into 'master'
Resolve "Remove "remaining" word from artifacts information in job's page sidebar"
Closes #41929
See merge request gitlab-org/gitlab-ce!16405
Diffstat (limited to 'app/views/projects')
| -rw-r--r-- | app/views/projects/jobs/_sidebar.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/jobs/_sidebar.html.haml b/app/views/projects/jobs/_sidebar.html.haml index a71333497e6..e779473c239 100644 --- a/app/views/projects/jobs/_sidebar.html.haml +++ b/app/views/projects/jobs/_sidebar.html.haml @@ -24,7 +24,7 @@ - elsif @build.has_expiring_artifacts? %p.build-detail-row The artifacts will be removed in - %span.js-artifacts-remove= @build.artifacts_expire_at + %span= time_ago_in_words @build.artifacts_expire_at - if @build.artifacts? .btn-group.btn-group-justified{ role: :group } |