Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-06-10 16:11:53 +0300
committerPhil Hughes <me@iamphill.com>2016-06-13 13:06:38 +0300
commit304979f89777f4aca52b382fdbe3a593dc7e50f3 (patch)
tree5958cccebf5e8dac3c5fa1d923024614c7d94c45 /app/views/projects/builds
parentfab1c4a81b7eef247abe6bdd3775cf0ce42badc1 (diff)
Allow to show the time in the future
Diffstat (limited to 'app/views/projects/builds')
-rw-r--r--app/views/projects/builds/_sidebar.html.haml11
1 files changed, 7 insertions, 4 deletions
diff --git a/app/views/projects/builds/_sidebar.html.haml b/app/views/projects/builds/_sidebar.html.haml
index 0741426b5af..14571145313 100644
--- a/app/views/projects/builds/_sidebar.html.haml
+++ b/app/views/projects/builds/_sidebar.html.haml
@@ -16,11 +16,14 @@
.title
Build artifacts
- if @build.artifacts_expired?
- .artifacts-expired.alert.alert-warning
- The artifacts were removed #{time_ago_with_tooltip(@build.artifacts_expire_at)}
+ %p
+ The artifacts were removed
+ #{time_ago_with_tooltip(@build.artifacts_expire_at)}
- elsif @build.artifacts_expire_at
- .artifacts-expired.alert.alert-warning
- The artifacts will be removed in #{time_interval_in_words(@build.artifacts_expire_in)}
+ %p
+ The artifacts will be removed in
+ #{time_ago_with_tooltip(@build.artifacts_expire_at)}
+
- if @build.artifacts?
.btn-group.btn-group-justified{ role: :group }
- if @build.artifacts_expire_at