Merge remote-tracking branch 'mattermost/master' into auto-updater

src/common/config/defaultPreferences.js

@@ -20,6 +20,7 @@ const defaultPreferences = {
   showUnreadBadge: true,
   useSpellChecker: true,
   enableHardwareAcceleration: true,
+  autostart: true,
 };
 
 export default defaultPreferences;

src/common/config/upgradePreferences.js

@@ -20,7 +20,7 @@ function upgradeV0toV1(configV0) {
 }
 
 export default function upgradeToLatest(config) {
-  var configVersion = config.version ? config.version : 0;
+  const configVersion = config.version ? config.version : 0;
   switch (configVersion) {
   case 0:
     return upgradeToLatest(upgradeV0toV1(config));

src/common/osVersion.js

@@ -4,7 +4,7 @@
 'use strict';
 
 import os from 'os';
-var releaseSplit = os.release().split('.');
+const releaseSplit = os.release().split('.');
 
 export default {
   major: parseInt(releaseSplit[0], 10),

src/common/settings.js

@@ -45,7 +45,7 @@ export default {
     if (config.version !== defaultPreferences.version) {
       throw new Error('version ' + config.version + ' is not equal to ' + defaultPreferences.version);
     }
-    var data = JSON.stringify(config, null, '  ');
+    const data = JSON.stringify(config, null, '  ');
     fs.writeFile(configFile, data, 'utf8', callback);
   },
 
@@ -59,7 +59,7 @@ export default {
       fs.mkdirSync(dir);
     }
 
-    var data = JSON.stringify(config, null, '  ');
+    const data = JSON.stringify(config, null, '  ');
     fs.writeFileSync(configFile, data, 'utf8');
   },