[2023-07-12]: Pull Request Merge Queue - [GA] (github#36955)

sophietheking · jules-p · web-flow · commit e1d6f44de302 · 2023-07-12T21:42:11.000Z
Co-authored-by: Jules &lt;19994093+jules-p@users.noreply.github.com&gt;
diff --git a/content/actions/using-workflows/events-that-trigger-workflows.md b/content/actions/using-workflows/events-that-trigger-workflows.md
@@ -382,16 +382,14 @@ on:
     types: [created, deleted]
 ```
 
-{% ifversion fpt or ghec  %}
+{% ifversion merge-queue  %}
 
 ## `merge_group`
 
 | Webhook event payload | Activity types | `GITHUB_SHA` | `GITHUB_REF` |
 | --------------------- | -------------- | ------------ | -------------|
 | [`merge_group`](/webhooks-and-events/webhooks/webhook-events-and-payloads#merge_group) | `checks_requested` | SHA of the merge group | Ref of the merge group |
 
-{% data reusables.pull_requests.merge-queue-beta %}
-
 {% note %}
 
 **Note**: {% data reusables.developer-site.multiple_activity_types %} Although only the `checks_requested` activity type is supported, specifying the activity type will keep your workflow specific if more activity types are added in the future. For information about each activity type, see "[AUTOTITLE](/webhooks-and-events/webhooks/webhook-events-and-payloads#merge_group)." {% data reusables.developer-site.limit_workflow_to_activity_types %}
diff --git a/content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/merging-a-pull-request-with-a-merge-queue.md b/content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/merging-a-pull-request-with-a-merge-queue.md
@@ -2,8 +2,7 @@
 title: Merging a pull request with a merge queue
 intro: 'If a merge queue is required by the branch protection setting for the branch, you can add your pull requests to a merge queue and {% data variables.product.product_name %} will merge the pull requests for you once all required checks have passed.'
 versions:
-  fpt: '*'
-  ghec: '*'
+  feature: merge-queue
 topics:
   - Pull requests
 shortTitle: Merge PR with merge queue
@@ -14,8 +13,6 @@ defaultTool: webui
 product: '{% data reusables.gated-features.merge-queue %}'
 ---
 
-{% data reusables.pull_requests.merge-queue-beta %}
-
 ## About merge queues
 
 {% data reusables.pull_requests.merge-queue-overview %}
diff --git a/content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/about-merge-methods-on-github.md b/content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/about-merge-methods-on-github.md
@@ -16,7 +16,7 @@ shortTitle: About merge methods
 ---
 {% data reusables.pull_requests.configure_pull_request_merges_intro %} You can enforce one type of merge method, such as commit squashing or rebasing, by only enabling the desired method for your repository.
 
-{% ifversion fpt or ghec %}
+{% ifversion merge-queue %}
 {% note %}
 
 **Note:** When using the merge queue, you no longer get to choose the merge method, as this is controlled by the queue. {% data reusables.pull_requests.merge-queue-references %}
diff --git a/content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-a-merge-queue.md b/content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-a-merge-queue.md
@@ -2,8 +2,7 @@
 title: Managing a merge queue
 intro: You can increase development velocity with a merge queue for pull requests in your repository.
 versions:
-  fpt: '*'
-  ghec: '*'
+  feature: merge-queue
 permissions: People with admin permissions can manage merge queues for pull requests targeting selected branches of a repository.
 product: '{% data reusables.gated-features.merge-queue %}'
 topics:
@@ -14,8 +13,6 @@ redirect_from:
   - /repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/using-a-merge-queue
 ---
 
-{% data reusables.pull_requests.merge-queue-beta %}
-
 ## About merge queues
 
 {% data reusables.pull_requests.merge-queue-overview %}
diff --git a/content/repositories/configuring-branches-and-merges-in-your-repository/managing-protected-branches/about-protected-branches.md b/content/repositories/configuring-branches-and-merges-in-your-repository/managing-protected-branches/about-protected-branches.md
@@ -57,7 +57,7 @@ For each branch protection rule, you can choose to enable or disable the followi
 - [Require conversation resolution before merging](#require-conversation-resolution-before-merging)
 - [Require signed commits](#require-signed-commits)
 - [Require linear history](#require-linear-history)
-{% ifversion fpt or ghec %}
+{% ifversion merge-queue %}
 - [Require merge queue](#require-merge-queue)
 {% endif %}
 {%- ifversion required-deployments %}
@@ -158,11 +158,10 @@ Enforcing a linear commit history prevents collaborators from pushing merge comm
 
 Before you can require a linear commit history, your repository must allow squash merging or rebase merging. For more information, see "[AUTOTITLE](/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges)."
 
-{% ifversion fpt or ghec %}
+{% ifversion merge-queue %}
 
 ### Require merge queue
 
-{% data reusables.pull_requests.merge-queue-beta %}
 {% data reusables.pull_requests.merge-queue-overview %}
 
 {% data reusables.pull_requests.merge-queue-merging-method %}
diff --git a/content/repositories/configuring-branches-and-merges-in-your-repository/managing-protected-branches/managing-a-branch-protection-rule.md b/content/repositories/configuring-branches-and-merges-in-your-repository/managing-protected-branches/managing-a-branch-protection-rule.md
@@ -81,14 +81,8 @@ When you create a branch rule, the branch you specify doesn't have to exist yet
 1. Optionally, select **Require conversation resolution before merging**.
 1. Optionally, select **Require signed commits**.
 1. Optionally, select **Require linear history**.
-{%- ifversion fpt or ghec %}
+{%- ifversion merge-queue %}
 1. Optionally, to merge pull requests using a merge queue, select **Require merge queue**. {% data reusables.pull_requests.merge-queue-references %}
-
-  {% tip %}
-
-  **Tip:** The pull request merge queue feature is currently in public beta and subject to change.
-
-  {% endtip %}
 {%- endif %}
 {%- ifversion required-deployments %}
 1. Optionally, to choose which environments the changes must be successfully deployed to before merging, select **Require deployments to succeed before merging**, then select the environments.
diff --git a/content/search-github/searching-on-github/searching-issues-and-pull-requests.md b/content/search-github/searching-on-github/searching-issues-and-pull-requests.md
@@ -72,15 +72,16 @@ You can filter issues and pull requests based on whether they're open or closed
 | `is:open` | [**performance is:open is:issue**](https://github.com/search?q=performance+is%3Aopen+is%3Aissue&type=Issues) matches open issues with the word "performance."
 | `is:closed` | [**android is:closed**](https://github.com/search?utf8=%E2%9C%93&q=android+is%3Aclosed&type=) matches closed issues and pull requests with the word "android."
 
+{% ifversion merge-queue  %}
 ## Search for pull requests in the merge queue
 
-{% data reusables.pull_requests.merge-queue-beta %}
-
 You can also use the `is` qualifier to find pull requests that are queued to merge.
 
 | Qualifier | Example |
 | --- | --- |
-| `is:queued` | [**is:queued**](https://github.com/search?q=is%3Aqueued&type=pullrequests) matches pull requests that are currently queued to merge. |
+| `is:queued` | [**is:queued**](https://github.com/search?q=is%3Aqueued&type=pullrequests) matches pull requests that are currently queued to merge.
+
+{% endif %}
 
 {% ifversion issue-close-reasons %}
 
diff --git a/data/features/merge-queue.yml b/data/features/merge-queue.yml
@@ -0,0 +1,5 @@
+# Reference: #10195
+versions:
+  fpt: '*'
+  ghec: '*'
+  ghes: '>=3.11'
diff --git a/data/reusables/pull_requests/merge-queue-beta.md b/data/reusables/pull_requests/merge-queue-beta.md
