diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-01-17 21:01:06 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-01-17 21:01:06 +0000 |
| commit | 195448c28c3a3238126e9e21f7b1abb8f186980e (patch) | |
| tree | 0d2d760317e17aeb3a7dc0d74ffc5d1978a00cb0 /app/views/projects/jobs/_sidebar.html.haml | |
| parent | 525b178e5d5cfe127fe2cfc6f211725e6c3089ae (diff) | |
| parent | f351cc28c2c878bf491bb0886be65bf35b58b261 (diff) | |
| download | gitlab-ce-195448c28c3a3238126e9e21f7b1abb8f186980e.tar.gz | |
Merge branch 'master' into 'dispatcher-project-mr-edit'dispatcher-project-mr-edit
# Conflicts:
# app/assets/javascripts/dispatcher.js
Diffstat (limited to 'app/views/projects/jobs/_sidebar.html.haml')
| -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 } |