diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-07-05 16:39:29 +0300 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-07-05 16:39:29 +0300 |
| commit | 9a62e72db9892708ab360c59a9f77695d9253c34 (patch) | |
| tree | 6ed9bad07c2e149ebf78c2a7b2feb79e7a6cc35f | |
| parent | 2510985f52aa82184fe98dad16d8b2182b80b22a (diff) | |
| parent | 7fa509b8ca71dbdfd1567d50201fc8009e0df694 (diff) | |
Merge branch 'patch-19' into 'master'
fix double "in" in time to artifact deletion
See merge request gitlab-org/gitlab-ce!20357
| -rw-r--r-- | app/views/projects/jobs/_sidebar.html.haml | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/20357.yml | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/app/views/projects/jobs/_sidebar.html.haml b/app/views/projects/jobs/_sidebar.html.haml index 459150c1067..8d890d19278 100644 --- a/app/views/projects/jobs/_sidebar.html.haml +++ b/app/views/projects/jobs/_sidebar.html.haml @@ -14,8 +14,8 @@ #{time_ago_with_tooltip(@build.artifacts_expire_at)} - elsif @build.has_expiring_artifacts? %p.build-detail-row - The artifacts will be removed in - %span= time_ago_with_tooltip @build.artifacts_expire_at + The artifacts will be removed + #{time_ago_with_tooltip(@build.artifacts_expire_at)} - if @build.artifacts? .btn-group.d-flex{ role: :group } diff --git a/changelogs/unreleased/20357.yml b/changelogs/unreleased/20357.yml new file mode 100644 index 00000000000..b4ce686eece --- /dev/null +++ b/changelogs/unreleased/20357.yml @@ -0,0 +1,5 @@ +--- +title: Fix double "in" in time to artifact deletion message +merge_request: 20357 +author: "@bbodenmiller" +type: fixed |