diff options
| author | Phil Hughes <me@iamphill.com> | 2016-06-10 17:19:17 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-06-13 11:08:15 +0100 |
| commit | 93080b65cd42ca90ccab8c9ecb2b68c79aafa193 (patch) | |
| tree | 6a78c4e824424f83674ec98727b55f24a7cc1ed5 | |
| parent | e0673f82c9ee222cf807438520a5abbd75a70456 (diff) | |
| download | gitlab-ce-93080b65cd42ca90ccab8c9ecb2b68c79aafa193.tar.gz | |
Displays time remaining relative to now
| -rw-r--r-- | app/assets/javascripts/application.js.coffee | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/ci/build.coffee | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee index 33e593f4376..69d4c4f5dd3 100644 --- a/app/assets/javascripts/application.js.coffee +++ b/app/assets/javascripts/application.js.coffee @@ -254,8 +254,6 @@ $ -> .on "resize.app", (e) -> fitSidebarForSize() - jQuery.timeago.settings.allowFuture = true; - gl.awardsHandler = new AwardsHandler() checkInitialSidebarSize() new Aside() 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), ' ') |