Commit a058660f authored by Cindy Pallares 🦉's avatar Cindy Pallares 🦉

Merge branch 'ce-to-ee-2018-11-01' into 'master'

CE upstream - 2018-11-01 16:21 UTC

See merge request gitlab-org/gitlab-ee!8183
parents 2e33a554 60f8a54a
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,
},
}),
);
});
......@@ -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,
......
---
title: Add dynamic timer for delayed jobs in job list
merge_request: 22656
author:
type: changed
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