From fc53ce8e6ca67bf217470179a1ea6cf139bcffad Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Thu, 12 Dec 2019 09:07:48 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 app/assets/javascripts/jobs/components/sidebar.vue | 4 ++--
 app/assets/javascripts/jobs/store/utils.js         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'app/assets/javascripts/jobs')

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
-- 
cgit v1.2.3