Merge branch 'master' into master

.eslintignore

@@ -0,0 +1,4 @@
+**/spec/fixtures/**/*.js
+node_modules
+/vendor/
+/out/

.eslintrc.json

@@ -0,0 +1,44 @@
+{
+  "extends": [
+    "./script/node_modules/eslint-config-standard/eslintrc.json",
+    "./script/node_modules/eslint-config-prettier/index.js",
+    "./script/node_modules/eslint-config-prettier/standard.js"
+  ],
+  "plugins": [
+    "prettier"
+  ],
+  "env": {
+    "browser": true,
+    "node": true
+  },
+  "parser": "babel-eslint",
+  "parserOptions": {
+    "ecmaVersion": 8,
+    "ecmaFeatures": {
+      "jsx": true
+    }
+  },
+  "globals": {
+    "atom": true,
+    "snapshotResult": true
+  },
+  "rules": {
+    "standard/no-callback-literal": ["off"],
+    "node/no-deprecated-api": ["off"],
+    "prettier/prettier": ["error"]
+  },
+  "overrides": [
+    {
+      "files": ["spec/**", "**-spec.js", "**.test.js"],
+      "env": {
+        "jasmine": true
+      },
+      "globals": {
+        "advanceClock": true,
+        "fakeClearInterval": true,
+        "fakeSetInterval": true,
+        "waitsForPromise": true
+      }
+    }
+  ]
+}

.gitattributes

@@ -15,3 +15,13 @@ spec/fixtures/sample.txt text eol=lf
 
 # Windows bash scripts are also Unix LF endings
 *.sh		eol=lf
+
+# The script executables should be LF so they can be edited on Windows
+script/bootstrap text eol=lf
+script/build text eol=lf
+script/cibuild text eol=lf
+script/clean text eol=lf
+script/lint text eol=lf
+script/postprocess-junit-results text eol=lf
+script/test text eol=lf
+script/verify-snapshot-script text eol=lf

.github/lock.yml

@@ -8,7 +8,7 @@ lockComment: >
   any recent activity after it was closed. If you can still reproduce this issue in
   [Safe Mode](https://flight-manual.atom.io/hacking-atom/sections/debugging/#using-safe-mode)
   then please open a new issue and fill out
-  [the entire issue template](https://github.com/atom/atom/blob/master/ISSUE_TEMPLATE.md)
+  [the entire issue template](https://github.com/atom/.github/blob/master/.github/ISSUE_TEMPLATE/bug_report.md)
   to ensure that we have enough information to address your issue. Thanks!
 # Issues or pull requests with these labels will not be locked
 exemptLabels: