diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-12 09:07:48 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-12 09:07:48 +0000 |
| commit | fc53ce8e6ca67bf217470179a1ea6cf139bcffad (patch) | |
| tree | 3721386728719a7779d1cd627281e9a28cc40c4a /app/assets/javascripts/jobs | |
| parent | 8e22ef10e4f9c6d1ef2411aa26ddd0658e2f1461 (diff) | |
| download | gitlab-ce-fc53ce8e6ca67bf217470179a1ea6cf139bcffad.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/jobs')
| -rw-r--r-- | app/assets/javascripts/jobs/components/sidebar.vue | 4 | ||||
| -rw-r--r-- | app/assets/javascripts/jobs/store/utils.js | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/jobs/components/sidebar.vue b/app/assets/javascripts/jobs/components/sidebar.vue index 1df57f1aa14..415fa46835b 100644 --- a/app/assets/javascripts/jobs/components/sidebar.vue +++ b/app/assets/javascripts/jobs/components/sidebar.vue @@ -168,13 +168,13 @@ export default { /> <detail-row v-if="job.finished_at" - :value="timeFormated(job.finished_at)" + :value="timeFormatted(job.finished_at)" class="js-job-finished" title="Finished" /> <detail-row v-if="job.erased_at" - :value="timeFormated(job.erased_at)" + :value="timeFormatted(job.erased_at)" class="js-job-erased" title="Erased" /> diff --git a/app/assets/javascripts/jobs/store/utils.js b/app/assets/javascripts/jobs/store/utils.js index 179d0bc4e0f..0b28c52a78f 100644 --- a/app/assets/javascripts/jobs/store/utils.js +++ b/app/assets/javascripts/jobs/store/utils.js @@ -114,7 +114,7 @@ export const logLinesParser = (lines = [], accumulator = []) => acc.push(parseHeaderLine(line, lineNumber)); } else if (isCollapsibleSection(acc, last, line)) { // if the object belongs to a nested section, we append it to the new `lines` array of the - // previously formated header + // previously formatted header last.lines.push(parseLine(line, lineNumber)); } else if (line.section_duration) { // if the line has section_duration, we look for the correct header to add it |