Skip to content

Commit 0389340

Browse files
authored
GHAE docs feature flag: Conversation menu and conversation resolution branch protection rule (github#19547)
1 parent a85c946 commit 0389340

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

content/github/administering-a-repository/defining-the-mergeability-of-pull-requests/about-protected-branches.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ By default, the restrictions of a branch protection rule don't apply to people w
4040
For each branch protection rule, you can choose to enable or disable the following settings.
4141
- [Require pull request reviews before merging](#require-pull-request-reviews-before-merging)
4242
- [Require status checks before merging](#require-status-checks-before-merging)
43-
{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "[email protected]" %}
43+
{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "[email protected]" or currentVersion == "github-ae@issue-4382" %}
4444
- [Require conversation resolution before merging](#require-conversation-resolution-before-merging){% endif %}
4545
- [Require signed commits](#require-signed-commits)
4646
- [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
9898

9999
For troubleshooting information, see "[Troubleshooting required status checks](/github/administering-a-repository/troubleshooting-required-status-checks)."
100100

101-
{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "[email protected]" %}
101+
{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "[email protected]" or currentVersion == "github-ae@issue-4382" %}
102102
#### Require conversation resolution before merging
103103

104104
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.

content/github/administering-a-repository/defining-the-mergeability-of-pull-requests/managing-a-branch-protection-rule.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ When you create a branch rule, the branch you specify doesn't have to exist yet
6565
![Loose or strict required status checkbox](/assets/images/help/repository/protecting-branch-loose-status.png)
6666
- From the list of available status checks, select the checks you want to require.
6767
![List of available status checks](/assets/images/help/repository/required-statuses-list.png)
68-
{%- if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "[email protected]" %}
68+
{%- if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "[email protected]" or currentVersion == "github-ae@issue-4382" %}
6969
1. Optionally, select **Require conversation resolution before merging**.
7070
![Require conversation resolution before merging option](/assets/images/help/repository/require-conversation-resolution.png)
7171
{%- endif %}

data/reusables/pull_requests/resolving-conversations.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ The entire conversation will be collapsed and marked as resolved, making it easi
1212

1313
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)."
1414

15-
{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "[email protected]" %}
15+
{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "[email protected]" or currentVersion == "github-ae@issue-4382" %}
1616
#### Discovering and navigating conversations
1717

1818
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.

0 commit comments

Comments
 (0)