From 7fa509b8ca71dbdfd1567d50201fc8009e0df694 Mon Sep 17 00:00:00 2001
From: Ben Bodenmiller <bbodenmiller@hotmail.com>
Date: Thu, 5 Jul 2018 13:39:29 +0000
Subject: [PATCH] fix double "in" in time to artifact deletion
---
app/views/projects/jobs/_sidebar.html.haml | 4 ++--
changelogs/unreleased/20357.yml | 5 +++++
2 files changed, 7 insertions(+), 2 deletions(-)
create mode 100644 changelogs/unreleased/20357.yml
diff --git a/app/views/projects/jobs/_sidebar.html.haml b/app/views/projects/jobs/_sidebar.html.haml
index 459150c10677e..8d890d192789f 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 0000000000000..b4ce686eece83
--- /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
--
GitLab