Merge branch 'main' into scheduled-workflow-tests

Author: sarahs

content/github/administering-a-repository/managing-auto-merge-for-pull-requests-in-your-repository.md

@@ -11,7 +11,11 @@ topics:
   - repositories
 ---
 
-If you allow auto-merge for pull requests in your repository, people can configure individual pull requests in the repository to merge automatically when all merge requirements are met. For more information, see "[Automatically merging a pull request](/github/collaborating-with-issues-and-pull-requests/automatically-merging-a-pull-request)."
+### About auto-merge
+
+If you allow auto-merge for pull requests in your repository, people with write permissions can configure individual pull requests in the repository to merge automatically when all merge requirements are met. {% if currentVersion == "free-pro-team@latest" or currentVersion == "github-ae@next" or currentVersion ver_gt "enterprise-server@3.1" %}If someone who does not have write permissions pushes changes to a pull request that has auto-merge enabled, auto-merge will be disabled for that pull request. {% endif %}For more information, see "[Automatically merging a pull request](/github/collaborating-with-issues-and-pull-requests/automatically-merging-a-pull-request)."
+
+### Managing auto-merge
 
 {% data reusables.repositories.navigate-to-repo %}
 {% data reusables.repositories.sidebar-settings %}

content/github/collaborating-with-issues-and-pull-requests/automatically-merging-a-pull-request.md

@@ -14,7 +14,9 @@ topics:
 
 If you enable auto-merge for a pull request, the pull request will merge automatically when all required reviews are met and status checks have passed. Auto-merge prevents you from waiting around for requirements to be met, so you can move on to other tasks.
 
-Before you can use auto-merge with a pull request, auto-merge must be enabled for the repository. For more information, see "[Managing auto-merge for pull requests in your repository](/github/administering-a-repository/managing-auto-merge-for-pull-requests-in-your-repository)."
+Before you can use auto-merge with a pull request, auto-merge must be enabled for the repository. For more information, see "[Managing auto-merge for pull requests in your repository](/github/administering-a-repository/managing-auto-merge-for-pull-requests-in-your-repository)."{% if currentVersion == "free-pro-team@latest" or currentVersion == "github-ae@next" or currentVersion ver_gt "enterprise-server@3.1" %}
+
+After you enable auto-merge for a pull request, if someone who does not have write permissions to the repository pushes new changes to the head branch or switches the base branch of the pull request, auto-merge will be disabled. For example, if a maintainer enables auto-merge for a pull request from a fork, auto-merge will be disabled after a contributor pushes new changes to the pull request.{% endif %}
 
 You can provide feedback about auto-merge by [contacting us](https://support.github.com/contact/feedback?category=prs-and-code-review&subject=Pull%20request%20auto-merge%20feedback).
 

lib/redis/create-client.js

@@ -42,10 +42,30 @@ module.exports = function createClient (options = {}) {
       }
     },
 
+    // Any running command that is unfulfilled when a connection is lost should
+    // NOT be retried after the connection has been reestablished.
+    retry_unfulfilled_commands: false,
+
+    // If we failed to send a new command during a disconnection, do NOT
+    // enqueue it to send later after the connection has been [re-]established.
+    // This is also critical to preventing a backend pile-up!
+    enable_offline_queue: false,
+
     // Expand whatever other options and overrides were provided
     ...options
   })
 
+  // Handle connection errors to prevent killing the Node.js process
+  client.on('error', (connectError) => {
+    try {
+      // Forcibly close the connection to the Redis server.
+      // Allow all still running commands to silently fail immediately.
+      client.end(false)
+    } catch (disconnectError) {
+      // Swallow any failure
+    }
+  })
+
   // If a `name` was provided, use it in the prefix for logging event messages
   const logPrefix = '[redis' + (name ? ` (${name})` : '') + ']'