kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'patch-19' into 'master'

Browse source 
fix double "in" in time to artifact deletion

See merge request gitlab-org/gitlab-ce!20357
This commit is contained in:
Filipa Lacerda 2018-07-05 13:39:29 +00:00
commit 9a62e72db9
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/views/projects/jobs/_sidebar.html.haml
View file

@ -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 }

5
changelogs/unreleased/20357.yml Normal file
View file

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