From 0389340998e88b000b284acd749dd38559e74d33 Mon Sep 17 00:00:00 2001 From: Felicity Chapman Date: Fri, 11 Jun 2021 09:24:15 +0100 Subject: [PATCH] GHAE docs feature flag: Conversation menu and conversation resolution branch protection rule (#19547) --- .../about-protected-branches.md | 4 ++-- .../managing-a-branch-protection-rule.md | 2 +- data/reusables/pull_requests/resolving-conversations.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/content/github/administering-a-repository/defining-the-mergeability-of-pull-requests/about-protected-branches.md b/content/github/administering-a-repository/defining-the-mergeability-of-pull-requests/about-protected-branches.md index 494a1ff8f4..898e3cc8b4 100644 --- a/content/github/administering-a-repository/defining-the-mergeability-of-pull-requests/about-protected-branches.md +++ b/content/github/administering-a-repository/defining-the-mergeability-of-pull-requests/about-protected-branches.md @@ -40,7 +40,7 @@ By default, the restrictions of a branch protection rule don't apply to people w For each branch protection rule, you can choose to enable or disable the following settings. - [Require pull request reviews before merging](#require-pull-request-reviews-before-merging) - [Require status checks before merging](#require-status-checks-before-merging) -{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.1" %} +{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.1" or currentVersion == "github-ae@issue-4382" %} - [Require conversation resolution before merging](#require-conversation-resolution-before-merging){% endif %} - [Require signed commits](#require-signed-commits) - [Require linear history](#require-linear-history) @@ -98,7 +98,7 @@ You can set up required status checks to either be "loose" or "strict." The type For troubleshooting information, see "[Troubleshooting required status checks](/github/administering-a-repository/troubleshooting-required-status-checks)." -{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.1" %} +{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.1" or currentVersion == "github-ae@issue-4382" %} #### Require conversation resolution before merging Requires all comments on the pull request to be resolved before it can be merged to a protected branch. This ensures that all comments are addressed or acknowledged before merge. diff --git a/content/github/administering-a-repository/defining-the-mergeability-of-pull-requests/managing-a-branch-protection-rule.md b/content/github/administering-a-repository/defining-the-mergeability-of-pull-requests/managing-a-branch-protection-rule.md index 4dffaee35a..a2646a8d7d 100644 --- a/content/github/administering-a-repository/defining-the-mergeability-of-pull-requests/managing-a-branch-protection-rule.md +++ b/content/github/administering-a-repository/defining-the-mergeability-of-pull-requests/managing-a-branch-protection-rule.md @@ -65,7 +65,7 @@ When you create a branch rule, the branch you specify doesn't have to exist yet ![Loose or strict required status checkbox](/assets/images/help/repository/protecting-branch-loose-status.png) - From the list of available status checks, select the checks you want to require. ![List of available status checks](/assets/images/help/repository/required-statuses-list.png) -{%- if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.1" %} +{%- if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.1" or currentVersion == "github-ae@issue-4382" %} 1. Optionally, select **Require conversation resolution before merging**. ![Require conversation resolution before merging option](/assets/images/help/repository/require-conversation-resolution.png) {%- endif %} diff --git a/data/reusables/pull_requests/resolving-conversations.md b/data/reusables/pull_requests/resolving-conversations.md index b1ca7ca6bd..6c2734b45a 100644 --- a/data/reusables/pull_requests/resolving-conversations.md +++ b/data/reusables/pull_requests/resolving-conversations.md @@ -12,7 +12,7 @@ The entire conversation will be collapsed and marked as resolved, making it easi If the suggestion in a comment is out of your pull request's scope, you can open a new issue that tracks the feedback and links back to the original comment. For more information, see "[Opening an issue from a comment](/github/managing-your-work-on-github/opening-an-issue-from-a-comment)." -{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.1" %} +{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.1" or currentVersion == "github-ae@issue-4382" %} #### Discovering and navigating conversations You can discover and navigate to all the conversations in your pull request using the **Conversations** menu that's shown at the top of the **Files Changed** tab.