From 7c12137d3ce6a8aa153f869b074f96fdbb091c70 Mon Sep 17 00:00:00 2001 From: JonRB <4564448+eeyrjmr@users.noreply.github.com> Date: Mon, 20 Feb 2023 19:22:26 +0000 Subject: [PATCH 01/10] scoped label documentation update update documentation to include an overview of the yaml label template that is part of https://github.com/go-gitea/gitea/pull/22976 --- .../content/doc/advanced/customizing-gitea.en-us.md | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/docs/content/doc/advanced/customizing-gitea.en-us.md b/docs/content/doc/advanced/customizing-gitea.en-us.md index 18fc1b3e73d1..f375be3ab502 100644 --- a/docs/content/doc/advanced/customizing-gitea.en-us.md +++ b/docs/content/doc/advanced/customizing-gitea.en-us.md @@ -282,7 +282,18 @@ To add custom .gitignore, add a file with existing [.gitignore rules](https://gi ### Labels -To add a custom label set, add a file that follows the [label format](https://github.com/go-gitea/gitea/blob/main/options/label/Default) to `$GITEA_CUSTOM/options/label` +To add a custom label set, add a file that follows [yaml label format](https://github.com/go-gitea/gitea/blob/main/options/label/Advanced.yaml) to `$GITEA_CUSTOM/options/label` + +``` +labels: + -name: "foo/bar" # name of the label that will appear in the dropdown + exclusive: true # whether to use the exclusive namespace for scoped labels. scoped delimiter is / + color: aabbcc # hex colour coding + description: Some label # long description of label intent + ``` + +the legacy semi-colon delimited file format can be used that follows [label format](https://github.com/go-gitea/gitea/blob/main/options/label/Default) to `$GITEA_CUSTOM/options/label` + `#hex-color label name ; label description` ### Licenses From 5b6bfb4764f7aa08f522e6947eb12c271ace76b9 Mon Sep 17 00:00:00 2001 From: JonRB <4564448+eeyrjmr@users.noreply.github.com> Date: Mon, 20 Feb 2023 21:05:33 +0000 Subject: [PATCH 02/10] Update docs/content/doc/advanced/customizing-gitea.en-us.md Co-authored-by: Yarden Shoham --- docs/content/doc/advanced/customizing-gitea.en-us.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/content/doc/advanced/customizing-gitea.en-us.md b/docs/content/doc/advanced/customizing-gitea.en-us.md index f375be3ab502..8027f445e6e2 100644 --- a/docs/content/doc/advanced/customizing-gitea.en-us.md +++ b/docs/content/doc/advanced/customizing-gitea.en-us.md @@ -282,7 +282,7 @@ To add custom .gitignore, add a file with existing [.gitignore rules](https://gi ### Labels -To add a custom label set, add a file that follows [yaml label format](https://github.com/go-gitea/gitea/blob/main/options/label/Advanced.yaml) to `$GITEA_CUSTOM/options/label` +To add a custom label set, add a file that follows the [yaml label format](https://github.com/go-gitea/gitea/blob/main/options/label/Advanced.yaml) to `$GITEA_CUSTOM/options/label` ``` labels: From 4a4e3eb5184e31d20f8ec9ea6940cbb0ad71c60d Mon Sep 17 00:00:00 2001 From: JonRB <4564448+eeyrjmr@users.noreply.github.com> Date: Mon, 20 Feb 2023 21:05:40 +0000 Subject: [PATCH 03/10] Update docs/content/doc/advanced/customizing-gitea.en-us.md Co-authored-by: Yarden Shoham --- docs/content/doc/advanced/customizing-gitea.en-us.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/content/doc/advanced/customizing-gitea.en-us.md b/docs/content/doc/advanced/customizing-gitea.en-us.md index 8027f445e6e2..281ddb8c5417 100644 --- a/docs/content/doc/advanced/customizing-gitea.en-us.md +++ b/docs/content/doc/advanced/customizing-gitea.en-us.md @@ -286,10 +286,10 @@ To add a custom label set, add a file that follows the [yaml label format](https ``` labels: - -name: "foo/bar" # name of the label that will appear in the dropdown - exclusive: true # whether to use the exclusive namespace for scoped labels. scoped delimiter is / - color: aabbcc # hex colour coding - description: Some label # long description of label intent + - name: "foo/bar" # name of the label that will appear in the dropdown + exclusive: true # whether to use the exclusive namespace for scoped labels. scoped delimiter is / + color: aabbcc # hex colour coding + description: Some label # long description of label intent ``` the legacy semi-colon delimited file format can be used that follows [label format](https://github.com/go-gitea/gitea/blob/main/options/label/Default) to `$GITEA_CUSTOM/options/label` From 640a47f5fba0aca6c348a396a56f8a281f342370 Mon Sep 17 00:00:00 2001 From: JonRB <4564448+eeyrjmr@users.noreply.github.com> Date: Tue, 21 Feb 2023 14:31:43 +0000 Subject: [PATCH 04/10] Update docs/content/doc/advanced/customizing-gitea.en-us.md Co-authored-by: Lauris BH --- docs/content/doc/advanced/customizing-gitea.en-us.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/content/doc/advanced/customizing-gitea.en-us.md b/docs/content/doc/advanced/customizing-gitea.en-us.md index 281ddb8c5417..d602f6fdeae4 100644 --- a/docs/content/doc/advanced/customizing-gitea.en-us.md +++ b/docs/content/doc/advanced/customizing-gitea.en-us.md @@ -292,7 +292,7 @@ labels: description: Some label # long description of label intent ``` -the legacy semi-colon delimited file format can be used that follows [label format](https://github.com/go-gitea/gitea/blob/main/options/label/Default) to `$GITEA_CUSTOM/options/label` +The legacy semi-colon delimited file format can be used that follows [label format](https://github.com/go-gitea/gitea/blob/main/options/label/Default) to `$GITEA_CUSTOM/options/label`. `#hex-color label name ; label description` From 180ff1ffe40e3d85661b319582fcfc6ca1f21b8b Mon Sep 17 00:00:00 2001 From: JonRB <4564448+eeyrjmr@users.noreply.github.com> Date: Tue, 21 Feb 2023 14:32:15 +0000 Subject: [PATCH 05/10] Update docs/content/doc/advanced/customizing-gitea.en-us.md Co-authored-by: Lauris BH --- docs/content/doc/advanced/customizing-gitea.en-us.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/content/doc/advanced/customizing-gitea.en-us.md b/docs/content/doc/advanced/customizing-gitea.en-us.md index d602f6fdeae4..3da4ef0882d2 100644 --- a/docs/content/doc/advanced/customizing-gitea.en-us.md +++ b/docs/content/doc/advanced/customizing-gitea.en-us.md @@ -282,7 +282,7 @@ To add custom .gitignore, add a file with existing [.gitignore rules](https://gi ### Labels -To add a custom label set, add a file that follows the [yaml label format](https://github.com/go-gitea/gitea/blob/main/options/label/Advanced.yaml) to `$GITEA_CUSTOM/options/label` +To add a custom label set, add a file that follows the [YAML label format](https://github.com/go-gitea/gitea/blob/main/options/label/Advanced.yaml) to `$GITEA_CUSTOM/options/label`: ``` labels: From 5e255c7c5b48a446f2591d70a913019f941c2d96 Mon Sep 17 00:00:00 2001 From: JonRB <4564448+eeyrjmr@users.noreply.github.com> Date: Mon, 6 Mar 2023 18:33:24 +0000 Subject: [PATCH 06/10] added link to the new labels overview page --- docs/content/doc/advanced/customizing-gitea.en-us.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/content/doc/advanced/customizing-gitea.en-us.md b/docs/content/doc/advanced/customizing-gitea.en-us.md index 3da4ef0882d2..4bf3eedbae2f 100644 --- a/docs/content/doc/advanced/customizing-gitea.en-us.md +++ b/docs/content/doc/advanced/customizing-gitea.en-us.md @@ -296,6 +296,8 @@ The legacy semi-colon delimited file format can be used that follows [label form `#hex-color label name ; label description` +Please review [custom labels configuration](https://docs.gitea.io/en-us/labels/) + ### Licenses To add a custom license, add a file with the license text to `$GITEA_CUSTOM/options/license` From fae6edba65c045849d5a17d61877aaa5a823cd1d Mon Sep 17 00:00:00 2001 From: JonRB <4564448+eeyrjmr@users.noreply.github.com> Date: Mon, 6 Mar 2023 19:11:07 +0000 Subject: [PATCH 07/10] Update docs/content/doc/advanced/customizing-gitea.en-us.md Co-authored-by: John Olheiser --- docs/content/doc/advanced/customizing-gitea.en-us.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/content/doc/advanced/customizing-gitea.en-us.md b/docs/content/doc/advanced/customizing-gitea.en-us.md index 4bf3eedbae2f..3b4b332ba23b 100644 --- a/docs/content/doc/advanced/customizing-gitea.en-us.md +++ b/docs/content/doc/advanced/customizing-gitea.en-us.md @@ -296,7 +296,7 @@ The legacy semi-colon delimited file format can be used that follows [label form `#hex-color label name ; label description` -Please review [custom labels configuration](https://docs.gitea.io/en-us/labels/) +For more information, see the [labels documentation]({{< relref "doc/usage/labels.en-us.md" >}}). ### Licenses From 03961de99488fa328fa659d7484618ade11cc16f Mon Sep 17 00:00:00 2001 From: JonRB <4564448+eeyrjmr@users.noreply.github.com> Date: Mon, 6 Mar 2023 19:11:56 +0000 Subject: [PATCH 08/10] Update docs/content/doc/advanced/customizing-gitea.en-us.md Co-authored-by: delvh --- docs/content/doc/advanced/customizing-gitea.en-us.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/content/doc/advanced/customizing-gitea.en-us.md b/docs/content/doc/advanced/customizing-gitea.en-us.md index 3b4b332ba23b..53ba581069b9 100644 --- a/docs/content/doc/advanced/customizing-gitea.en-us.md +++ b/docs/content/doc/advanced/customizing-gitea.en-us.md @@ -282,7 +282,7 @@ To add custom .gitignore, add a file with existing [.gitignore rules](https://gi ### Labels -To add a custom label set, add a file that follows the [YAML label format](https://github.com/go-gitea/gitea/blob/main/options/label/Advanced.yaml) to `$GITEA_CUSTOM/options/label`: +Starting with Gitea 1.19, you can add a file that follows the [YAML label format](https://github.com/go-gitea/gitea/blob/main/options/label/Advanced.yaml) to `$GITEA_CUSTOM/options/label`: ``` labels: From deb75bd4c13cf8d0adc1c6be4dbd0f33e0a1bda7 Mon Sep 17 00:00:00 2001 From: JonRB <4564448+eeyrjmr@users.noreply.github.com> Date: Mon, 6 Mar 2023 21:48:34 +0000 Subject: [PATCH 09/10] Update docs/content/doc/advanced/customizing-gitea.en-us.md Co-authored-by: John Olheiser --- docs/content/doc/advanced/customizing-gitea.en-us.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/content/doc/advanced/customizing-gitea.en-us.md b/docs/content/doc/advanced/customizing-gitea.en-us.md index 53ba581069b9..3cc80bb44ed4 100644 --- a/docs/content/doc/advanced/customizing-gitea.en-us.md +++ b/docs/content/doc/advanced/customizing-gitea.en-us.md @@ -292,7 +292,7 @@ labels: description: Some label # long description of label intent ``` -The legacy semi-colon delimited file format can be used that follows [label format](https://github.com/go-gitea/gitea/blob/main/options/label/Default) to `$GITEA_CUSTOM/options/label`. +The [legacy file format](https://github.com/go-gitea/gitea/blob/main/options/label/Default) can still be used following the format below, however we strongly recommend using the newer YAML format instead. `#hex-color label name ; label description` From be5b35182a3466a39bf7d32641c2e0b598979c07 Mon Sep 17 00:00:00 2001 From: JonRB <4564448+eeyrjmr@users.noreply.github.com> Date: Mon, 6 Mar 2023 21:48:52 +0000 Subject: [PATCH 10/10] Update docs/content/doc/advanced/customizing-gitea.en-us.md Co-authored-by: delvh --- docs/content/doc/advanced/customizing-gitea.en-us.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/content/doc/advanced/customizing-gitea.en-us.md b/docs/content/doc/advanced/customizing-gitea.en-us.md index 3cc80bb44ed4..bad6342aad44 100644 --- a/docs/content/doc/advanced/customizing-gitea.en-us.md +++ b/docs/content/doc/advanced/customizing-gitea.en-us.md @@ -284,7 +284,7 @@ To add custom .gitignore, add a file with existing [.gitignore rules](https://gi Starting with Gitea 1.19, you can add a file that follows the [YAML label format](https://github.com/go-gitea/gitea/blob/main/options/label/Advanced.yaml) to `$GITEA_CUSTOM/options/label`: -``` +```yaml labels: - name: "foo/bar" # name of the label that will appear in the dropdown exclusive: true # whether to use the exclusive namespace for scoped labels. scoped delimiter is /