timeago should be a dependency of datetime_utilitymove-timeago-to-vendor-dir

5 files changed, 12 insertions, 8 deletions

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 9333c6e8586..76f3c6506ed 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -19,7 +19,6 @@
 /*= require jquery.scrollTo */
 /*= require jquery.turbolinks */
 /*= require js.cookie */
-/*= require timeago */
 /*= require turbolinks */
 /*= require autosave */
 /*= require bootstrap/affix */
diff --git a/app/assets/javascripts/environments/components/environment_item.js.es6 b/app/assets/javascripts/environments/components/environment_item.js.es6
index 36a0fec3cab..07f49cce3dc 100644
--- a/app/assets/javascripts/environments/components/environment_item.js.es6
+++ b/app/assets/javascripts/environments/components/environment_item.js.es6
@@ -1,4 +1,7 @@
-/*= require lib/utils/timeago */
+/* global Vue */
+/* global timeago */
+
+/*= require timeago */
 /*= require lib/utils/text_utility */
 /*= require vue_common_component/commit */
 /*= require ./environment_actions */
@@ -6,9 +9,6 @@
 /*= require ./environment_stop */
 /*= require ./environment_rollback */
 
-/* global Vue */
-/* global timeago */
-
 (() => {
   /**
    * Envrionment Item Component
diff --git a/app/assets/javascripts/lib/utils/datetime_utility.js b/app/assets/javascripts/lib/utils/datetime_utility.js
index d480fdc882b..963d2851e5f 100644
--- a/app/assets/javascripts/lib/utils/datetime_utility.js
+++ b/app/assets/javascripts/lib/utils/datetime_utility.js
@@ -1,4 +1,10 @@
-/* eslint-disable func-names, space-before-function-paren, wrap-iife, no-var, no-param-reassign, no-cond-assign, no-undef, comma-dangle, no-unused-expressions, prefer-template, padded-blocks, max-len */
+/* eslint-disable func-names, space-before-function-paren, wrap-iife, no-var, no-param-reassign, no-cond-assign, comma-dangle, no-unused-expressions, prefer-template, padded-blocks, max-len */
+/* global timeago */
+/* global dateFormat */
+
+/*= require timeago */
+/*= require date.format */
+
 (function() {
   (function(w) {
     var base;
diff --git a/spec/javascripts/build_spec.js.es6 b/spec/javascripts/build_spec.js.es6
index ee192c4f18a..4208e076e96 100644
--- a/spec/javascripts/build_spec.js.es6
+++ b/spec/javascripts/build_spec.js.es6
@@ -2,7 +2,6 @@
 /* global Build */
 /* global Turbolinks */
 
-//= require lib/utils/timeago
 //= require lib/utils/datetime_utility
 //= require build
 //= require breakpoints
diff --git a/spec/javascripts/merge_request_widget_spec.js b/spec/javascripts/merge_request_widget_spec.js
index f38e9cb8ef5..62890f1ca96 100644
--- a/spec/javascripts/merge_request_widget_spec.js
+++ b/spec/javascripts/merge_request_widget_spec.js
@@ -1,6 +1,6 @@
 /* eslint-disable space-before-function-paren, quotes, comma-dangle, dot-notation, indent, quote-props, no-var, padded-blocks, max-len */
+
 /*= require merge_request_widget */
-/*= require lib/utils/timeago */
 /*= require lib/utils/datetime_utility */
 
 (function() {