Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
304979f8
Commit
304979f8
authored
Jun 10, 2016
by
Kamil Trzcinski
Committed by
Phil Hughes
Jun 13, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow to show the time in the future
parent
fab1c4a8
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
5 deletions
+9
-5
app/assets/javascripts/application.js.coffee
app/assets/javascripts/application.js.coffee
+2
-0
app/helpers/time_helper.rb
app/helpers/time_helper.rb
+0
-1
app/views/projects/builds/_sidebar.html.haml
app/views/projects/builds/_sidebar.html.haml
+7
-4
No files found.
app/assets/javascripts/application.js.coffee
View file @
304979f8
...
@@ -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
()
app/helpers/time_helper.rb
View file @
304979f8
...
@@ -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
...
...
app/views/projects/builds/_sidebar.html.haml
View file @
304979f8
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment