Correct merge conflicts

Fixed eslint failures

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)$/));

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) {

vendor/assets/javascripts/date.format.js

@@ -11,8 +11,12 @@
  * The date defaults to the current date/time.
  * The mask defaults to dateFormat.masks.default.
  */
-
-var dateFormat = function () {
+ (function (global, factory) {
+     typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
+     typeof define === 'function' && define.amd ? define(factory) :
+     (global.dateFormat = factory());
+ }(this, (function () { 'use strict';
+  var dateFormat = function () {
     var token = /d{1,4}|m{1,4}|yy(?:yy)?|([HhMsTt])\1?|[LloSZ]|"[^"]*"|'[^']*'/g,
       timezone = /\b(?:[PMCEA][SDP]T|(?:Pacific|Mountain|Central|Eastern|Atlantic) (?:Standard|Daylight|Prevailing) Time|(?:GMT|UTC)(?:[-+]\d{4})?)\b/g,
       timezoneClip = /[^-+\dA-Z]/g,
@@ -89,10 +93,10 @@ var dateFormat = function () {
         return $0 in flags ? flags[$0] : $0.slice(1, $0.length - 1);
       });
     };
-}();
+  }();
 
-// Some common format strings
-dateFormat.masks = {
+  // Some common format strings
+  dateFormat.masks = {
     "default":      "ddd mmm dd yyyy HH:MM:ss",
     shortDate:      "m/d/yy",
     mediumDate:     "mmm d, yyyy",
@@ -105,10 +109,10 @@ dateFormat.masks = {
     isoTime:        "HH:MM:ss",
     isoDateTime:    "yyyy-mm-dd'T'HH:MM:ss",
     isoUtcDateTime: "UTC:yyyy-mm-dd'T'HH:MM:ss'Z'"
-};
+  };
 
-// Internationalization strings
-dateFormat.i18n = {
+  // Internationalization strings
+  dateFormat.i18n = {
     dayNames: [
       "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat",
       "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"
@@ -117,9 +121,12 @@ dateFormat.i18n = {
       "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec",
       "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"
     ]
-};
+  };
 
-// For convenience...
-Date.prototype.format = function (mask, utc) {
+  // For convenience...
+  Date.prototype.format = function (mask, utc) {
     return dateFormat(this, mask, utc);
-};
+  };
+
+  return dateFormat;
+})));