Merge branch 'main' into patch-1

.all-contributorsrc

@@ -322,6 +322,31 @@
         "content",
         "doc"
       ]
+    },
+    {
+      "login": "Simran-B",
+      "name": "Simran",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/7819991?v=4",
+      "profile": "https://www.arangodb.com/",
+      ]
+    },
+    {
+      "login": "Ruth",
+      "name": "Ruth",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/85029?v=4",
+      "profile": "https://github.com/ruth",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "wi5nia",
+      "name": "Tomasz Wisniewski",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/12593852?v=4",
+      "profile": "http://tomaszwisniewski.com",
+      "contributions": [
+        "doc"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.github/allowed-actions.js

@@ -23,7 +23,7 @@ module.exports = [
   'juliangruber/approve-pull-request-action@v1',
   'juliangruber/find-pull-request-action@v1',
   'juliangruber/read-file-action@v1',
-  'pascalgn/automerge-action@135f0bdb927d9807b5446f7ca9ecc2c51de03c4a',
+  'pascalgn/automerge-action@c9bd182',
   'peter-evans/create-issue-from-file@v2',
   'peter-evans/create-pull-request@v2',
   'rachmari/[email protected]',

.github/workflows/automerge.yml

@@ -20,18 +20,17 @@ on:
 jobs:
   automerge:
     runs-on: ubuntu-latest
-    if: contains(github.event.pull_request.labels.*.name, 'automerge')
+    if: contains(github.event.pull_request.labels.*.name, 'automerge') || contains(github.event.pull_request.labels.*.name, 'autosquash')
     steps:
       - name: automerge
-        uses: "pascalgn/automerge-action@135f0bdb927d9807b5446f7ca9ecc2c51de03c4a"
+        uses: "pascalgn/automerge-action@c9bd182"
         env:
           GITHUB_TOKEN: "${{ secrets.OCTOMERGER_PAT_WITH_REPO_AND_WORKFLOW_SCOPE }}"
-          MERGE_LABELS: "automerge"
-          MERGE_REMOVE_LABELS: ""
+          MERGE_METHOD_LABELS: "automerge=merge,autosquash=squash"
           MERGE_COMMIT_MESSAGE: "pull-request-title"
           MERGE_METHOD: "merge"
           MERGE_FORKS: "true"
           MERGE_RETRIES: "50"
-          MERGE_RETRY_SLEEP: "10000"
-          UPDATE_LABELS: "automerge"
+          MERGE_RETRY_SLEEP: "10000" # ten seconds
+          UPDATE_LABELS: "automerge,autosquash"
           UPDATE_METHOD: "merge"

.github/workflows/start-new-engineering-pr-workflow.yml

@@ -6,7 +6,6 @@ on:
 
 jobs:
   triage:
-    if: github.repository == 'github/docs-internal'
     runs-on: ubuntu-latest
     continue-on-error: true
     env:

README.md

@@ -120,6 +120,9 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <td align="center"><a href="https://mcaffer.com"><img src="https://avatars2.githubusercontent.com/u/10070956?v=4" width="64px;" alt=""/><br /><sub><b>Jeff McAffer</b></sub></a><br /><a href="https://github.com/github/docs/commits?author=jeffmcaffer" title="Documentation">📖</a></td>
     <td align="center"><a href="https://tjenkinson.me"><img src="https://avatars0.githubusercontent.com/u/3259993?v=4" width="64px;" alt=""/><br /><sub><b>Tom Jenkinson</b></sub></a><br /><a href="https://github.com/github/docs/commits?author=tjenkinson" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/casals"><img src="https://avatars0.githubusercontent.com/u/785860?v=4" width="64px;" alt=""/><br /><sub><b>Arthur Casals</b></sub></a><br /><a href="#content-casals" title="Content">🖋</a> <a href="https://github.com/github/docs/commits?author=casals" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://www.arangodb.com/"><img src="https://avatars3.githubusercontent.com/u/7819991?v=4" width="64px;" alt=""/><br /><sub><b>Simran</b></sub></a><br /><a href="https://github.com/github/docs/commits?author=Simran-B" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/ruth"><img src="https://avatars0.githubusercontent.com/u/85029?v=4" width="64px;" alt=""/><br /><sub><b>Ruth</b></sub></a><br /><a href="#content-Ruth" title="Content">🖋</a></td>
+    <td align="center"><a href="http://tomaszwisniewski.com"><img src="https://avatars2.githubusercontent.com/u/12593852?v=4" width="64px;" alt=""/><br /><sub><b>Tomasz Wisniewski</b></sub></a><br /><a href="https://github.com/github/docs/commits?author=wi5nia" title="Documentation">📖</a></td>
   </tr>
 </table>
 

content/rest/reference/interactions.md

@@ -28,9 +28,9 @@ The Organization Interactions API allows organization owners to temporarily rest
 
 The Repository Interactions API allows people with owner or admin access to temporarily restrict which users can comment, open issues, or create pull requests in a public repository. {% data reusables.interactions.interactions-detail %} Here's more about the groups of {% data variables.product.product_name %} users:
 
-* {% data reusables.interactions.existing-user-limit-definition %} in the respository.
-* {% data reusables.interactions.contributor-user-limit-definition %} in the respository.
-* {% data reusables.interactions.collaborator-user-limit-definition %} in the respository.
+* {% data reusables.interactions.existing-user-limit-definition %} in the repository.
+* {% data reusables.interactions.contributor-user-limit-definition %} in the repository.
+* {% data reusables.interactions.collaborator-user-limit-definition %} in the repository.
 
 {% for operation in currentRestOperations %}
   {% if operation.subcategory == 'repos' %}{% include rest_operation %}{% endif %}

contributing/content-style-guide.md

@@ -336,7 +336,7 @@ When referencing text in the user interface, reproduce the text exactly. Use quo
 ### More resources
 GitHub Brand Guide:
 - [Referring to GitHub features and product elements](https://brand.github.com/content/terminology/#referring-to-github-features-and-product-elements)
-- [Page names and UI references](https://brand.github.com/content/grammar-usage/#page-names-and-ui-references)
+- [Page names and UI references](https://brand.github.com/content/grammar#page-names-and-ui-references)
 Microsoft Style Guide:
 - [Formatting text in instructions](https://docs.microsoft.com/en-us/style-guide/procedures-instructions/formatting-text-in-instructions)
 
@@ -346,7 +346,7 @@ Use clear, simple language that’s approachable and accessible for a wide range
 
 ## Word choice and terminology
 
-For general guidance and GitHub-specific terms, see “[Terminology](https://brand.github.com/content/terminology) in and “[Words that can be tricky](https://brand.github.com/content/grammar-usage/#words-that-can-be-tricky)” in GitHub’s Brand Guide. For more detailed guidance, see the “[A-Z word list](https://docs.microsoft.com/en-us/style-guide)” in Microsoft’s style guide.
+For general guidance and GitHub-specific terms, see “[Terminology](https://brand.github.com/content/terminology) in and “[Words that can be tricky](https://brand.github.com/content/grammar#words-that-can-be-tricky)” in GitHub’s Brand Guide. For more detailed guidance, see the “[A-Z word list](https://docs.microsoft.com/en-us/style-guide)” in Microsoft’s style guide.
 
 ### Abbreviations
 

middleware/events.js

@@ -35,7 +35,7 @@ async function airtablePost (req, res, next) {
     return res.status(201).send({ id: records[0].getId() })
   } catch (err) {
     console.error('unable to POST event', err)
-    return res.status(err.statusCode).send(err)
+    return res.status(502).send({})
   }
 }
 
@@ -52,11 +52,11 @@ router.post('/', async (req, res, next) => {
   const fields = omit(req.body, OMIT_FIELDS)
   try {
     const hydroRes = await req.hydro.publish(req.hydro.schemas[req.body.type], fields)
-    if (!hydroRes.ok) return res.status(500).json({})
+    if (!hydroRes.ok) return res.status(502).json({})
     return res.status(201).json(fields)
   } catch (err) {
     if (process.env.NODE_ENV === 'development') console.log(err)
-    return res.status(500).json({})
+    return res.status(502).json({})
   }
 })
 
@@ -82,7 +82,7 @@ router.put('/:id', async (req, res, next) => {
     return res.status(200).send({})
   } catch (err) {
     console.error('unable to PUT event', err)
-    return res.status(err.statusCode).send(err)
+    return res.status(502).send({})
   }
 })