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
Léo-Paul Géneau
gitlab-ce
Commits
d0747af4
Commit
d0747af4
authored
Oct 29, 2018
by
Winnie Hellmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add dynamic timer for delayed jobs in job list
parent
f7c0a18b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
3 deletions
+24
-3
app/assets/javascripts/pages/projects/jobs/index/index.js
app/assets/javascripts/pages/projects/jobs/index/index.js
+16
-0
app/views/projects/ci/builds/_build.html.haml
app/views/projects/ci/builds/_build.html.haml
+3
-3
changelogs/unreleased/winh-job-list-dynamic-timer.yml
changelogs/unreleased/winh-job-list-dynamic-timer.yml
+5
-0
No files found.
app/assets/javascripts/pages/projects/jobs/index/index.js
0 → 100644
View file @
d0747af4
import
Vue
from
'
vue
'
;
import
GlCountdown
from
'
~/vue_shared/components/gl_countdown.vue
'
;
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
const
remainingTimeElements
=
document
.
querySelectorAll
(
'
.js-remaining-time
'
);
remainingTimeElements
.
forEach
(
el
=>
new
Vue
({
...
GlCountdown
,
el
,
propsData
:
{
endDateString
:
el
.
dateTime
,
},
}),
);
});
app/views/projects/ci/builds/_build.html.haml
View file @
d0747af4
...
...
@@ -105,10 +105,10 @@
=
icon
(
'remove'
,
class:
'cred'
)
-
elsif
job
.
scheduled?
.btn-group
.btn.btn-default.has-tooltip
{
disabled:
true
,
title:
job
.
scheduled_at
}
.btn.btn-default
{
disabled:
true
}
=
sprite_icon
(
'planning'
)
=
duration_in_numbers
(
job
.
execute_in
)
%time
.js-remaining-time
{
datetime:
job
.
scheduled_at
.
utc
.
iso8601
}
=
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
,
...
...
changelogs/unreleased/winh-job-list-dynamic-timer.yml
0 → 100644
View file @
d0747af4
---
title
:
Add dynamic timer for delayed jobs in job list
merge_request
:
22656
author
:
type
:
changed
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