From 1aed8bef063b3753489dc1a09bd3e740847cbbb0 Mon Sep 17 00:00:00 2001 From: Jan Gleytenhoover Date: Wed, 25 Sep 2024 06:59:06 +0000 Subject: [PATCH 1/2] docs: Update README.md --- Readme.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Readme.md b/Readme.md index 3e3a0fa..1323a2d 100644 --- a/Readme.md +++ b/Readme.md @@ -56,4 +56,10 @@ docker compose up ### Keycloak Token 1. Auf der Projektebene [GetBearerToken.http](GetBearerToken.http) öffnen. 2. Neben der Request auf den grünen Pfeil drücken -3. Aus dem Reponse das access_token kopieren \ No newline at end of file +3. Aus dem Reponse das access_token kopieren + +# Conventions + +### Commits +Commits and merge request names MUST be done as documented here: https://www.conventionalcommits.org/en/v1.0.0/ +Merge request titles MUST also include the ticket id from our jira tickets. The jira board can be opened through the issues tab. \ No newline at end of file -- 2.45.2 From 76fe1af56316ceea309acd6739fad95fa50df804 Mon Sep 17 00:00:00 2001 From: Jan Gleytenhoover Date: Wed, 25 Sep 2024 07:01:34 +0000 Subject: [PATCH 2/2] docs: Update README.md --- Readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Readme.md b/Readme.md index 1323a2d..3f1c15e 100644 --- a/Readme.md +++ b/Readme.md @@ -62,4 +62,4 @@ docker compose up ### Commits Commits and merge request names MUST be done as documented here: https://www.conventionalcommits.org/en/v1.0.0/ -Merge request titles MUST also include the ticket id from our jira tickets. The jira board can be opened through the issues tab. \ No newline at end of file +Merge request titles MAY also include the ticket id from our jira tickets if the Merge request is part of a ticket. The jira board can be opened through the issues tab. \ No newline at end of file -- 2.45.2