Skip to content

Commit 2838f0f

Browse files
authored
docs: Add missing link to schema for merge_queue repository rule (#2581)
* docs: Add missing link to schema for `merge_queue` repository rule Closes #2579. * docs: Update `merge_queue.max_entries_to_merge` description Replace copy-pasted description.
1 parent fd72b8a commit 2838f0f

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

website/docs/r/repository_ruleset.html.markdown

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ The `rules` block supports the following:
120120

121121
* `non_fast_forward` - (Optional) (Boolean) Prevent users with push access from force pushing to branches.
122122

123-
* `merge_queue` - (Optional) (Block List, Max: 1) Merges must be performed via a merge queue.
123+
* `merge_queue` - (Optional) (Block List, Max: 1) Merges must be performed via a merge queue. (see [below for nested schema](#rules.merge_queue))
124124

125125
* `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](#rulespull_request))
126126

@@ -195,7 +195,7 @@ The `rules` block supports the following:
195195

196196
* `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`.
197197

198-
* `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`.
198+
* `max_entries_to_merge` - (Required) (Number) Limit the number of queued pull requests that will be merged together in a group. Defaults to `5`.
199199

200200
* `merge_method` - (Required) (String) Method to use when merging changes from queued pull requests. Can be one of: MERGE, SQUASH, REBASE. Defaults to `MERGE`.
201201

0 commit comments

Comments
 (0)