Merge branch 'main' into codespaces

Author: janiceilene

.editorconfig

@@ -0,0 +1,11 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false

.github/ISSUE_TEMPLATE/improve-existing-docs.md

@@ -14,8 +14,8 @@ HUBBERS BEWARE! THE GITHUB/DOCS REPO IS PUBLIC TO THE ENTIRE INTERNET. OPEN AN I
 For questions, ask in Discussions: https://github.com/github/docs/discussions
 
 Before you file an issue read the: 
-- Code of Conduct: https://github.com/github/docs/blob/onboarding/CODE_OF_CONDUCT.md
-- Contributing guide: https://github.com/github/docs/blob/onboarding/CONTRIBUTING.md
+- Code of Conduct: https://github.com/github/docs/blob/main/CODE_OF_CONDUCT.md
+- Contributing guide: https://github.com/github/docs/blob/main/CONTRIBUTING.md
 
 Check to make sure someone hasn't already opened a similar issue: https://github.com/github/docs/issues
 -->

.github/ISSUE_TEMPLATE/improve-the-site.md

@@ -14,8 +14,8 @@ HUBBERS BEWARE! THE GITHUB/DOCS REPO IS PUBLIC TO THE ENTIRE INTERNET. OPEN AN I
 For questions, ask in Discussions: https://github.com/github/docs/discussions
 
 Before you file an issue read the: 
-- Code of Conduct: https://github.com/github/docs/blob/onboarding/CODE_OF_CONDUCT.md
-- Contributing guide: https://github.com/github/docs/blob/onboarding/CONTRIBUTING.md
+- Code of Conduct: https://github.com/github/docs/blob/main/CODE_OF_CONDUCT.md
+- Contributing guide: https://github.com/github/docs/blob/main/CONTRIBUTING.md
 
 Check to make sure someone hasn't already opened a similar issue: https://github.com/github/docs/issues
 -->

.github/allowed-actions.js

@@ -4,17 +4,13 @@
 // can be added it this list.
 
 module.exports = [
-  'actions/cache@70655ec8323daeeaa7ef06d7c56e1b9191396cbe',
-  'actions/cache@d1255ad9362389eac595a9ae406b8e8cb3331f16',
-  'actions/checkout@a81bbbf8298c0fa03ea29cdc473d45769f953675',
-  'actions/github-script@5d03ada4b0a753e9460b312e61cc4f8fdeacf163',
-  'actions/github-script@6e5ee1dc1cb3740e5e5e76ad668e3f526edbfe45',
-  'actions/github-script@44b873bc975058192f5279ebe7579496381f575d',
-  'actions/github-script@626af12fe9a53dc2972b48385e7fe7dec79145c9',
-  'actions/labeler@5f867a63be70efff62b767459b009290364495eb',
-  'actions/setup-node@56899e050abffc08c2b3b61f3ec6a79a9dc3223d',
-  'actions/setup-ruby@5f29a1cd8dfebf420691c4c9a0e832e2fae5a526',
-  'actions/stale@44f9eae0adddf72dbf3eedfacc999f70afcec1a8',
+  'actions/cache@0781355a23dac32fd3bac414512f4b903437991a', //actions/cache@v2.1.3
+  'actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f', //actions/checkout@v2.3.4
+  'actions/github-script@626af12fe9a53dc2972b48385e7fe7dec79145c9', //actions/script@v3.0.0
+  'actions/labeler@5f867a63be70efff62b767459b009290364495eb', //actions/labeler@v2.2.0
+  'actions/setup-node@56899e050abffc08c2b3b61f3ec6a79a9dc3223d', //actions/setup-node@v1.4.4
+  'actions/setup-ruby@5f29a1cd8dfebf420691c4c9a0e832e2fae5a526', //actions/setup-ruby@v1.1.2
+  'actions/stale@af4072615903a8b031f986d25b1ae3bf45ec44d4', //actions/stale@v3.0.13
   'crowdin/github-action@fd9429dd63d6c0f8a8cb4b93ad8076990bd6e688',
   'dawidd6/action-delete-branch@47743101a121ad657031e6704086271ca81b1911',
   'docker://chinthakagodawita/autoupdate-action:v1',
@@ -31,7 +27,7 @@ module.exports = [
   'rachmari/actions-add-new-issue-to-column@1a459ef92308ba7c9c9dc2fcdd72f232495574a9',
   'rachmari/labeler@832d42ec5523f3c6d46e8168de71cd54363e3e2e',
   'repo-sync/github-sync@3832fe8e2be32372e1b3970bbae8e7079edeec88',
-  'repo-sync/pull-request@ea6773388b83b337e4da9a223293309f2c3670e7',
+  'repo-sync/pull-request@33777245b1aace1a58c87a29c90321aa7a74bd7d',
   'rtCamp/action-slack-notify@e17352feaf9aee300bf0ebc1dfbf467d80438815',
   'tjenkinson/gh-action-auto-merge-dependency-updates@cee2ac0'
 ]

.github/workflows/60-days-stale-check.yml

@@ -7,9 +7,9 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/stale@44f9eae0adddf72dbf3eedfacc999f70afcec1a8
+    - uses: actions/stale@af4072615903a8b031f986d25b1ae3bf45ec44d4
       with:
-        repo-token: ${{ secrets.GITHUB_TOKEN }} 
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
         stale-issue-message: 'This issue is stale because it has been open 60 days with no activity.'
         stale-pr-message: 'This PR is stale because it has been open 60 days with no activity.'
         days-before-stale: 60

.github/workflows/automerge-dependencies.yml

@@ -1,8 +1,16 @@
 name: Auto Merge Dependency Updates
 
 on:
-  - pull_request
-  - pull_request_review
+  pull_request:
+    paths:
+      - "package*.json"
+      - "Gemfile*"
+      - "Dockerfile"
+      - ".github/workflows/**"
+  pull_request_review:
+    types:
+      - edited
+      - submitted
 
 jobs:
   run:

.github/workflows/browser-test.yml

@@ -20,22 +20,18 @@ jobs:
           paths: '[".github/workflows/browser-test.yml","assets/**", "content/**", "data/**", "includes/**", "javascripts/**", "jest-puppeteer.config.js", "jest.config.js", "layouts/**", "lib/**", "middleware/**", "package-lock.json", "package.json", "server.js", "translations/**", "webpack.config.js"]'
   build:
     needs: see_if_should_skip
+    if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
     runs-on: ubuntu-latest
     steps:
-      # Each of these ifs needs to be repeated at each step to make sure the required check still runs
-      # Even if if doesn't do anything
-      - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
-        name: Checkout
-        uses: actions/checkout@a81bbbf8298c0fa03ea29cdc473d45769f953675
+      - name: Checkout
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
 
-      - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
-        name: Install
+      - name: Install
         uses: ianwalter/puppeteer@12728ddef82390d1ecd4732fb543f62177392fbb
         with:
           args: npm ci
 
-      - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
-        name: Test
+      - name: Test
         uses: ianwalter/puppeteer@12728ddef82390d1ecd4732fb543f62177392fbb
         with:
           args: npm run browser-test

.github/workflows/check-all-english-links.yml

@@ -10,7 +10,7 @@ jobs:
     if: github.repository == 'github/docs-internal'
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@a81bbbf8298c0fa03ea29cdc473d45769f953675
+    - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
     - name: npm ci
       run: npm ci
     - name: npm run build

.github/workflows/codeql.yml

@@ -8,14 +8,10 @@ on:
 
 jobs:
   build:
-
-    strategy:
-      fail-fast: false
-
     runs-on: ubuntu-latest 
 
     steps:
-    - uses: actions/checkout@a81bbbf8298c0fa03ea29cdc473d45769f953675
+    - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
     - uses: github/codeql-action/init@v1
       with:
         languages: javascript # comma separated list of values from {go, python, javascript, java, cpp, csharp} (not YET ruby, sorry!)

.github/workflows/crowdin.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@a81bbbf8298c0fa03ea29cdc473d45769f953675
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
 
       - name: Sync
         uses: crowdin/github-action@fd9429dd63d6c0f8a8cb4b93ad8076990bd6e688