Commit 304979f8 authored by Kamil Trzcinski's avatar Kamil Trzcinski Committed by Phil Hughes

Allow to show the time in the future

parent fab1c4a8
...@@ -254,6 +254,8 @@ $ -> ...@@ -254,6 +254,8 @@ $ ->
.on "resize.app", (e) -> .on "resize.app", (e) ->
fitSidebarForSize() fitSidebarForSize()
jQuery.timeago.settings.allowFuture = true;
gl.awardsHandler = new AwardsHandler() gl.awardsHandler = new AwardsHandler()
checkInitialSidebarSize() checkInitialSidebarSize()
new Aside() new Aside()
...@@ -20,7 +20,6 @@ module TimeHelper ...@@ -20,7 +20,6 @@ module TimeHelper
end end
end end
def date_from_to(from, to) def date_from_to(from, to)
"#{from.to_s(:short)} - #{to.to_s(:short)}" "#{from.to_s(:short)} - #{to.to_s(:short)}"
end end
......
...@@ -16,11 +16,14 @@ ...@@ -16,11 +16,14 @@
.title .title
Build artifacts Build artifacts
- if @build.artifacts_expired? - if @build.artifacts_expired?
.artifacts-expired.alert.alert-warning %p
The artifacts were removed #{time_ago_with_tooltip(@build.artifacts_expire_at)} The artifacts were removed
#{time_ago_with_tooltip(@build.artifacts_expire_at)}
- elsif @build.artifacts_expire_at - elsif @build.artifacts_expire_at
.artifacts-expired.alert.alert-warning %p
The artifacts will be removed in #{time_interval_in_words(@build.artifacts_expire_in)} The artifacts will be removed in
#{time_ago_with_tooltip(@build.artifacts_expire_at)}
- if @build.artifacts? - if @build.artifacts?
.btn-group.btn-group-justified{ role: :group } .btn-group.btn-group-justified{ role: :group }
- if @build.artifacts_expire_at - if @build.artifacts_expire_at
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment