summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/ci
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-06-10 17:19:17 +0100
committerPhil Hughes <me@iamphill.com>2016-06-13 11:08:15 +0100
commit93080b65cd42ca90ccab8c9ecb2b68c79aafa193 (patch)
tree6a78c4e824424f83674ec98727b55f24a7cc1ed5 /app/assets/javascripts/ci
parente0673f82c9ee222cf807438520a5abbd75a70456 (diff)
downloadgitlab-ce-93080b65cd42ca90ccab8c9ecb2b68c79aafa193.tar.gz
Displays time remaining relative to now
Diffstat (limited to 'app/assets/javascripts/ci')
-rw-r--r--app/assets/javascripts/ci/build.coffee9
1 files changed, 9 insertions, 0 deletions
diff --git a/app/assets/javascripts/ci/build.coffee b/app/assets/javascripts/ci/build.coffee
index f763ba96e33..2d515d7efa2 100644
--- a/app/assets/javascripts/ci/build.coffee
+++ b/app/assets/javascripts/ci/build.coffee
@@ -17,6 +17,8 @@ class @CiBuild
.off 'resize.build'
.on 'resize.build', @hideSidebar
+ @updateArtifactRemoveDate()
+
if $('#build-trace').length
@getInitialBuildTrace()
@initScrollButtonAffix()
@@ -103,3 +105,10 @@ class @CiBuild
$('.js-build-sidebar')
.removeClass 'right-sidebar-collapsed'
.addClass 'right-sidebar-expanded'
+
+ updateArtifactRemoveDate: ->
+ $date = $('.js-artifacts-remove')
+
+ if $date.length
+ date = $date.text()
+ $date.text $.timefor(new Date(date), ' ')