Merge branch 'master' into wl-restrict-drag-events

DigDug101 · Sep 14, 2021 · 030cda7 · 030cda7
2 parents 2fa4c0a + b3930b0
commit 030cda7
Showing 479 changed files with 31,763 additions and 12,642 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -1,4 +1,4 @@
 **/spec/fixtures/**/*.js
 node_modules
 /vendor/
-/out/
+/out/
diff --git a/.gitattributes b/.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
diff --git a/.github/ISSUE_TEMPLATE/Feature_request.md b/.github/ISSUE_TEMPLATE/Feature_request.md
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
diff --git a/.github/PULL_REQUEST_TEMPLATE/bug_fix.md b/.github/PULL_REQUEST_TEMPLATE/bug_fix.md
diff --git a/.github/PULL_REQUEST_TEMPLATE/documentation.md b/.github/PULL_REQUEST_TEMPLATE/documentation.md
diff --git a/.github/PULL_REQUEST_TEMPLATE/feature_change.md b/.github/PULL_REQUEST_TEMPLATE/feature_change.md
diff --git a/.github/PULL_REQUEST_TEMPLATE/performance_improvement.md b/.github/PULL_REQUEST_TEMPLATE/performance_improvement.md
diff --git a/.github/lock.yml b/.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:

diff --git a/.gitignore b/.gitignore
@@ -6,14 +6,16 @@ Thumbs.db
 .project
 .svn
 .nvm-version
+.vscode
+.python-version
 node_modules
-npm-debug.log
-debug.log
+*.log
 /tags
 /atom-shell/
 /out/
 docs/output
 docs/includes
 spec/fixtures/evil-files/
+!spec/fixtures/packages/package-with-incompatible-native-module-loaded-conditionally/node_modules/
 out/
 /electron/
diff --git a/.python-version b/.python-version