Merge branch 'patch-19' into 'master'

fix double "in" in time to artifact deletion

See merge request gitlab-org/gitlab-ce!20357

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 }

changelogs/unreleased/20357.yml

+---
+title: Fix double "in" in time to artifact deletion message
+merge_request: 20357
+author: "@bbodenmiller"
+type: fixed