From 4de0e459ce1e71a702833b32d916a05e05f12bc4 Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Thu, 28 Apr 2022 15:15:43 +0200 Subject: [PATCH] docs: config options with type=string are always non-mergeable (#15357) --- docs/usage/configuration-options.md | 4 ++++ docs/usage/self-hosted-configuration.md | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/docs/usage/configuration-options.md b/docs/usage/configuration-options.md index 2155e6dd28..1e6f5aa50d 100644 --- a/docs/usage/configuration-options.md +++ b/docs/usage/configuration-options.md @@ -41,6 +41,10 @@ If a config option has a `parent` defined, it means it's only allowed to configu When an array or object configuration option is `mergeable`, it means that values inside it will be added to any existing object or array that existed with the same name. +<!-- prettier-ignore --> +!!! note + Config options with `type=string` are always non-mergeable, so `mergeable=false`. + --- ## addLabels diff --git a/docs/usage/self-hosted-configuration.md b/docs/usage/self-hosted-configuration.md index 7168509723..62c6508a6d 100644 --- a/docs/usage/self-hosted-configuration.md +++ b/docs/usage/self-hosted-configuration.md @@ -9,6 +9,10 @@ The configuration options listed in this document are applicable to self-hosted Please also see [Self-Hosted Experimental Options](./self-hosted-experimental.md). +<!-- prettier-ignore --> +!!! note + Config options with `type=string` are always non-mergeable, so `mergeable=false`. + ## allowCustomCrateRegistries ## allowPlugins -- GitLab