diff options
| author | Winnie Hellmann <winnie@gitlab.com> | 2018-10-04 14:53:15 +0200 |
|---|---|---|
| committer | Winnie Hellmann <winnie@gitlab.com> | 2018-10-04 14:54:22 +0200 |
| commit | 0fc93df02b7d1be4ec243298ff17045cbd4f049a (patch) | |
| tree | 33d9a3287f7cffad7074921f794d071bc583b655 /app/assets/javascripts | |
| parent | 4741c07f3fa61326665c36d4b9974025bf9dd9e9 (diff) | |
| download | gitlab-ce-0fc93df02b7d1be4ec243298ff17045cbd4f049a.tar.gz | |
Add component tests for scheduled job frontend
Diffstat (limited to 'app/assets/javascripts')
3 files changed, 5 insertions, 4 deletions
diff --git a/app/assets/javascripts/lib/utils/datetime_utility.js b/app/assets/javascripts/lib/utils/datetime_utility.js index abfcf1eaf3f..833dbefd3dc 100644 --- a/app/assets/javascripts/lib/utils/datetime_utility.js +++ b/app/assets/javascripts/lib/utils/datetime_utility.js @@ -373,6 +373,7 @@ window.gl.utils = { /** * Formats milliseconds as timestamp (e.g. 01:02:03). + * This takes durations longer than a day into account (e.g. two days would be 48:00:00). * * @param milliseconds * @returns {string} diff --git a/app/assets/javascripts/pipelines/components/pipelines_actions.vue b/app/assets/javascripts/pipelines/components/pipelines_actions.vue index f0e845d0773..743d241ee7a 100644 --- a/app/assets/javascripts/pipelines/components/pipelines_actions.vue +++ b/app/assets/javascripts/pipelines/components/pipelines_actions.vue @@ -27,7 +27,7 @@ export default { onClickAction(action) { if (action.scheduled_at) { const confirmationMessage = sprintf(s__("DelayedJobs|Are you sure you want to run %{jobName} immediately? This job will run automatically after it's timer finishes."), { jobName: action.name }); - // https://gitlab.com/gitlab-org/gitlab-ce/issues/52099 + // https://gitlab.com/gitlab-org/gitlab-ce/issues/52156 // eslint-disable-next-line no-alert if (!window.confirm(confirmationMessage)) { return; diff --git a/app/assets/javascripts/pipelines/components/pipelines_table_row.vue b/app/assets/javascripts/pipelines/components/pipelines_table_row.vue index 88957554d12..09ee190b8ca 100644 --- a/app/assets/javascripts/pipelines/components/pipelines_table_row.vue +++ b/app/assets/javascripts/pipelines/components/pipelines_table_row.vue @@ -63,10 +63,10 @@ export default { if (!this.pipeline || !this.pipeline.details) { return []; } - const { details: pipelineDetails } = this.pipeline; + const { details } = this.pipeline; return [ - ...(pipelineDetails.manual_actions || []), - ...(pipelineDetails.scheduled_actions || []), + ...(details.manual_actions || []), + ...(details.scheduled_actions || []), ]; }, /** |