diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2016-12-10 16:06:41 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-01-10 12:30:39 -0600 |
| commit | 3eb8569778ce2559eedab706f6f901238e39b355 (patch) | |
| tree | afe194eac0b529004bb0fba5478108092ad95a8c /app | |
| parent | a569aa295a9e733c1aa975d69a95a71a677a43bb (diff) | |
| download | gitlab-ce-3eb8569778ce2559eedab706f6f901238e39b355.tar.gz | |
Correct merge conflicts
Fixed eslint failures
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/application.js | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/lib/utils/datetime_utility.js | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 830d706f02d..6a6f827e580 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -47,7 +47,6 @@ require('./shortcuts_dashboard_navigation'); require('./shortcuts_issuable'); require('./shortcuts_network'); require('vendor/jquery.nicescroll'); -require('vendor/date.format'); requireAll(require.context('./behaviors', false, /^\.\/.*\.(js|es6)$/)); requireAll(require.context('./blob', false, /^\.\/.*\.(js|es6)$/)); requireAll(require.context('./templates', false, /^\.\/.*\.(js|es6)$/)); diff --git a/app/assets/javascripts/lib/utils/datetime_utility.js b/app/assets/javascripts/lib/utils/datetime_utility.js index b6c1fd4c4f8..f859fc9c0da 100644 --- a/app/assets/javascripts/lib/utils/datetime_utility.js +++ b/app/assets/javascripts/lib/utils/datetime_utility.js @@ -3,7 +3,7 @@ /* global dateFormat */ window.timeago = require('vendor/timeago'); -require('vendor/date.format'); +window.dateFormat = require('vendor/date.format'); (function() { (function(w) { @@ -17,7 +17,7 @@ require('vendor/date.format'); w.gl.utils.days = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday']; w.gl.utils.formatDate = function(datetime) { - return (new Date(datetime)).format('mmm d, yyyy h:MMtt Z'); + return dateFormat(datetime, 'mmm d, yyyy h:MMtt Z'); }; w.gl.utils.getDayName = function(date) { |