From a3c5699369503a3184dc96586f583283b493ee4a Mon Sep 17 00:00:00 2001 From: Usman <akeju00+github@gmail.com> Date: Sun, 2 Mar 2025 20:17:02 +0100 Subject: [PATCH 1/2] docs: Add missing link to schema for `merge_queue` repository rule Closes #2579. --- website/docs/r/repository_ruleset.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/repository_ruleset.html.markdown b/website/docs/r/repository_ruleset.html.markdown index 173ffcf234..2a31384d9e 100644 --- a/website/docs/r/repository_ruleset.html.markdown +++ b/website/docs/r/repository_ruleset.html.markdown @@ -88,7 +88,7 @@ The `rules` block supports the following: * `non_fast_forward` - (Optional) (Boolean) Prevent users with push access from force pushing to branches. -* `merge_queue` - (Optional) (Block List, Max: 1) Merges must be performed via a merge queue. +* `merge_queue` - (Optional) (Block List, Max: 1) Merges must be performed via a merge queue. (see [below for nested schema](#rules.merge_queue)) * `pull_request` - (Optional) (Block List, Max: 1) Require all commits be made to a non-target branch and submitted via a pull request before they can be merged. (see [below for nested schema](#rules.pull_request)) From 792f2eba9ff96732bab382351f975b0660873d3e Mon Sep 17 00:00:00 2001 From: Usman <akeju00+github@gmail.com> Date: Wed, 5 Mar 2025 08:32:32 +0100 Subject: [PATCH 2/2] docs: Update `merge_queue.max_entries_to_merge` description Replace copy-pasted description. --- website/docs/r/repository_ruleset.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/repository_ruleset.html.markdown b/website/docs/r/repository_ruleset.html.markdown index 2a31384d9e..4f81922485 100644 --- a/website/docs/r/repository_ruleset.html.markdown +++ b/website/docs/r/repository_ruleset.html.markdown @@ -156,7 +156,7 @@ The `rules` block supports the following: * `max_entries_to_build` - (Required) (Number) Limit the number of queued pull requests requesting checks and workflow runs at the same time. Defaults to `5`. -* `max_entries_to_merge` - (Required) (Number) Limit the number of queued pull requests requesting checks and workflow runs at the same time. Defaults to `5`. +* `max_entries_to_merge` - (Required) (Number) Limit the number of queued pull requests that will be merged together in a group. Defaults to `5`. * `merge_method` - (Required) (String) Method to use when merging changes from queued pull requests. Can be one of: MERGE, SQUASH, REBASE. Defaults to `MERGE`.