Add latest changes from gitlab-org/gitlab@master

2 files changed, 4 insertions, 4 deletions

diff --git a/app/assets/javascripts/vue_shared/mixins/related_issuable_mixin.js b/app/assets/javascripts/vue_shared/mixins/related_issuable_mixin.js
index 3c727cb7b3f..fbebd7c7945 100644
--- a/app/assets/javascripts/vue_shared/mixins/related_issuable_mixin.js
+++ b/app/assets/javascripts/vue_shared/mixins/related_issuable_mixin.js
@@ -159,7 +159,7 @@ const mixins = {
       return this.displayReference.split(this.pathIdSeparator).pop();
     },
     createdAtInWords() {
-      return this.createdAt ? this.timeFormated(this.createdAt) : '';
+      return this.createdAt ? this.timeFormatted(this.createdAt) : '';
     },
     createdAtTimestamp() {
       return this.createdAt ? formatDate(new Date(this.createdAt)) : '';
@@ -168,10 +168,10 @@ const mixins = {
       return this.mergedAt ? formatDate(new Date(this.mergedAt)) : '';
     },
     mergedAtInWords() {
-      return this.mergedAt ? this.timeFormated(this.mergedAt) : '';
+      return this.mergedAt ? this.timeFormatted(this.mergedAt) : '';
     },
     closedAtInWords() {
-      return this.closedAt ? this.timeFormated(this.closedAt) : '';
+      return this.closedAt ? this.timeFormatted(this.closedAt) : '';
     },
     closedAtTimestamp() {
       return this.closedAt ? formatDate(new Date(this.closedAt)) : '';
diff --git a/app/assets/javascripts/vue_shared/mixins/timeago.js b/app/assets/javascripts/vue_shared/mixins/timeago.js
index 4e3b9d7b767..af14c6d9486 100644
--- a/app/assets/javascripts/vue_shared/mixins/timeago.js
+++ b/app/assets/javascripts/vue_shared/mixins/timeago.js
@@ -5,7 +5,7 @@ import { formatDate, getTimeago } from '../../lib/utils/datetime_utility';
  */
 export default {
   methods: {
-    timeFormated(time) {
+    timeFormatted(time) {
       const timeago = getTimeago();
 
       return timeago.format(time);