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
23526470
Commit
23526470
authored
Oct 10, 2018
by
Shinya Maeda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Drop `allow_overflow` option in `TimeHelper.duration_in_numbers`
parent
e409834f
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
37 deletions
+18
-37
app/helpers/time_helper.rb
app/helpers/time_helper.rb
+7
-9
app/views/projects/ci/builds/_build.html.haml
app/views/projects/ci/builds/_build.html.haml
+1
-1
lib/gitlab/ci/status/build/scheduled.rb
lib/gitlab/ci/status/build/scheduled.rb
+1
-1
spec/helpers/time_helper_spec.rb
spec/helpers/time_helper_spec.rb
+9
-26
No files found.
app/helpers/time_helper.rb
View file @
23526470
...
...
@@ -21,17 +21,15 @@ module TimeHelper
"
#{
from
.
to_s
(
:short
)
}
-
#{
to
.
to_s
(
:short
)
}
"
end
def
duration_in_numbers
(
duration_in_seconds
,
allow_overflow
=
false
)
if
allow_overflow
def
duration_in_numbers
(
duration_in_seconds
)
seconds
=
duration_in_seconds
%
1
.
minute
minutes
=
(
duration_in_seconds
/
1
.
minute
)
%
(
1
.
hour
/
1
.
minute
)
hours
=
duration_in_seconds
/
1
.
hour
"%02d:%02d:%02d"
%
[
hours
,
minutes
,
seconds
]
if
hours
==
0
"%02d:%02d"
%
[
minutes
,
seconds
]
else
time_format
=
duration_in_seconds
<
1
.
hour
?
"%M:%S"
:
"%H:%M:%S"
Time
.
at
(
duration_in_seconds
).
utc
.
strftime
(
time_format
)
"%02d:%02d:%02d"
%
[
hours
,
minutes
,
seconds
]
end
end
end
app/views/projects/ci/builds/_build.html.haml
View file @
23526470
...
...
@@ -108,7 +108,7 @@
.btn.btn-default.has-tooltip
{
disabled:
true
,
title:
job
.
scheduled_at
}
=
sprite_icon
(
'planning'
)
=
duration_in_numbers
(
job
.
execute_in
,
true
)
=
duration_in_numbers
(
job
.
execute_in
)
-
confirmation_message
=
s_
(
"DelayedJobs|Are you sure you want to run %{job_name} immediately? This job will run automatically after it's timer finishes."
)
%
{
job_name:
job
.
name
}
=
link_to
play_project_job_path
(
job
.
project
,
job
,
return_to:
request
.
original_url
),
method: :post
,
...
...
lib/gitlab/ci/status/build/scheduled.rb
View file @
23526470
...
...
@@ -29,7 +29,7 @@ module Gitlab
def
execute_in
remaining_seconds
=
[
0
,
subject
.
scheduled_at
-
Time
.
now
].
max
duration_in_numbers
(
remaining_seconds
,
true
)
duration_in_numbers
(
remaining_seconds
)
end
end
end
...
...
spec/helpers/time_helper_spec.rb
View file @
23526470
...
...
@@ -22,34 +22,17 @@ describe TimeHelper do
describe
"#duration_in_numbers"
do
using
RSpec
::
Parameterized
::
TableSyntax
context
"without passing allow_overflow"
do
where
(
:duration
,
:formatted_string
)
do
0
|
"00:00"
1
.
second
|
"00:01"
42
.
seconds
|
"00:42"
2
.
minutes
+
1
.
second
|
"02:01"
3
.
hours
+
2
.
minutes
+
1
.
second
|
"03:02:01"
30
.
hours
|
"06:00:00"
end
with_them
do
it
{
expect
(
duration_in_numbers
(
duration
)).
to
eq
formatted_string
}
end
end
context
"with allow_overflow = true"
do
where
(
:duration
,
:formatted_string
)
do
0
|
"00:00:00"
1
.
second
|
"00:00:01"
42
.
seconds
|
"00:00:42"
2
.
minutes
+
1
.
second
|
"00:02:01"
3
.
hours
+
2
.
minutes
+
1
.
second
|
"03:02:01"
30
.
hours
|
"30:00:00"
end
with_them
do
it
{
expect
(
duration_in_numbers
(
duration
,
true
)).
to
eq
formatted_string
}
end
it
{
expect
(
duration_in_numbers
(
duration
)).
to
eq
formatted_string
}
end
end
end
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