diff --git a/src/content/docs/merge-protections/auto-merge.mdx b/src/content/docs/merge-protections/auto-merge.mdx index 44751a7345..ec78b918a3 100644 --- a/src/content/docs/merge-protections/auto-merge.mdx +++ b/src/content/docs/merge-protections/auto-merge.mdx @@ -165,6 +165,10 @@ merge_protections_settings: ## Constraints +Merge Protections must be enabled on the repository for +`auto_merge_conditions` to take effect, with or without the merge queue. See +[Enabling & Configuring Merge Protections](/merge-protections/setup). + `auto_merge_conditions` and `queue_rules[].autoqueue` cannot be used together. A configuration that sets both is rejected, so remove `autoqueue` from your queue rules in the same change. diff --git a/src/content/images/api-intro/application_keys.png b/src/content/images/api-intro/application_keys.png index 10d84d9f1b..e79ddd1afd 100644 Binary files a/src/content/images/api-intro/application_keys.png and b/src/content/images/api-intro/application_keys.png differ diff --git a/src/content/images/api-intro/application_keys_token.png b/src/content/images/api-intro/application_keys_token.png index 2e33f3058f..30bae64bdd 100644 Binary files a/src/content/images/api-intro/application_keys_token.png and b/src/content/images/api-intro/application_keys_token.png differ