summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/main.js
diff options
context:
space:
mode:
authorTim Zallmann <tzallmann@gitlab.com>2017-12-14 07:38:48 +0000
committerTim Zallmann <tzallmann@gitlab.com>2017-12-14 07:38:48 +0000
commit9daeccfb3ae70bd394be21ac2c1ed87b44cef7fe (patch)
tree2f7a69da544ce60243224c8f70e3b17e8e9927a3 /app/assets/javascripts/main.js
parent54c2d7bdbddc18953571ed928948c18471d6edfa (diff)
parent114f93cccff08771dab7c7d11cc24d73960f0fc5 (diff)
downloadgitlab-ce-9daeccfb3ae70bd394be21ac2c1ed87b44cef7fe.tar.gz
Merge branch '38869-datetime' into 'master'
Export date utility functions as ES6 modules See merge request gitlab-org/gitlab-ce!15782
Diffstat (limited to 'app/assets/javascripts/main.js')
-rw-r--r--app/assets/javascripts/main.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js
index 2db865f8abf..f99abeeeb6b 100644
--- a/app/assets/javascripts/main.js
+++ b/app/assets/javascripts/main.js
@@ -28,7 +28,7 @@ import './commit/image_file';
// lib/utils
import { handleLocationHash } from './lib/utils/common_utils';
-import './lib/utils/datetime_utility';
+import { localTimeAgo, renderTimeago } from './lib/utils/datetime_utility';
import { getLocationHash, visitUrl } from './lib/utils/url_utility';
// behaviors
@@ -186,7 +186,7 @@ $(function () {
return $(this).parents('form').submit();
// Form submitter
});
- gl.utils.localTimeAgo($('abbr.timeago, .js-timeago'), true);
+ localTimeAgo($('abbr.timeago, .js-timeago'), true);
// Disable form buttons while a form is submitting
$body.on('ajax:complete, ajax:beforeSend, submit', 'form', function (e) {
var buttons;
@@ -275,7 +275,7 @@ $(function () {
loadAwardsHandler();
new Aside();
- gl.utils.renderTimeago();
+ renderTimeago();
$(document).trigger('init.scrolling-tabs');