From f3b6c222fb11c96e2f8bbaa0622f46c8ec486874 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 19 Nov 2022 15:52:50 +0100 Subject: Merging upstream version 0.18.0. Signed-off-by: Daniel Baumann --- qa/expected/test_user_defined/test_user_defined_rules_examples_1 | 2 +- qa/expected/test_user_defined/test_user_defined_rules_examples_2 | 2 +- .../test_user_defined/test_user_defined_rules_examples_with_config_1 | 2 +- qa/expected/test_user_defined/test_user_defined_rules_extra_1 | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'qa/expected/test_user_defined') diff --git a/qa/expected/test_user_defined/test_user_defined_rules_examples_1 b/qa/expected/test_user_defined/test_user_defined_rules_examples_1 index 44add31..e675d7b 100644 --- a/qa/expected/test_user_defined/test_user_defined_rules_examples_1 +++ b/qa/expected/test_user_defined/test_user_defined_rules_examples_1 @@ -1,5 +1,5 @@ 1: T5 Title contains the word 'WIP' (case-insensitive): "WIP: Thi$ is å title" 1: UC2 Body does not contain a 'Signed-off-by' line -1: UC3 Branch name 'master' does not start with one of ['feature/', 'hotfix/', 'release/'] +1: UC3 Branch name 'main' does not start with one of ['feature/', 'hotfix/', 'release/'] 1: UL1 Title contains the special character '$': "WIP: Thi$ is å title" 2: B4 Second line is not empty: "Content on the second line" diff --git a/qa/expected/test_user_defined/test_user_defined_rules_examples_2 b/qa/expected/test_user_defined/test_user_defined_rules_examples_2 index 11766fc..9b96423 100644 --- a/qa/expected/test_user_defined/test_user_defined_rules_examples_2 +++ b/qa/expected/test_user_defined/test_user_defined_rules_examples_2 @@ -1,4 +1,4 @@ 1: UC2 Body does not contain a 'Signed-off-by' line -1: UC3 Branch name 'master' does not start with one of ['feature/', 'hotfix/', 'release/'] +1: UC3 Branch name 'main' does not start with one of ['feature/', 'hotfix/', 'release/'] 1: UL1 Title contains the special character '$' 2: B4 Second line is not empty diff --git a/qa/expected/test_user_defined/test_user_defined_rules_examples_with_config_1 b/qa/expected/test_user_defined/test_user_defined_rules_examples_with_config_1 index f514f5d..6e0d4cd 100644 --- a/qa/expected/test_user_defined/test_user_defined_rules_examples_with_config_1 +++ b/qa/expected/test_user_defined/test_user_defined_rules_examples_with_config_1 @@ -1,6 +1,6 @@ 1: T5 Title contains the word 'WIP' (case-insensitive): "WIP: Thi$ is å title" 1: UC1 Body contains too many lines (2 > 1) 1: UC2 Body does not contain a 'Signed-off-by' line -1: UC3 Branch name 'master' does not start with one of ['feature/', 'hotfix/', 'release/'] +1: UC3 Branch name 'main' does not start with one of ['feature/', 'hotfix/', 'release/'] 1: UL1 Title contains the special character '$': "WIP: Thi$ is å title" 2: B4 Second line is not empty: "Content on the second line" diff --git a/qa/expected/test_user_defined/test_user_defined_rules_extra_1 b/qa/expected/test_user_defined/test_user_defined_rules_extra_1 index 1f48fad..77642dc 100644 --- a/qa/expected/test_user_defined/test_user_defined_rules_extra_1 +++ b/qa/expected/test_user_defined/test_user_defined_rules_extra_1 @@ -1,7 +1,7 @@ 1: T5 Title contains the word 'WIP' (case-insensitive): "WIP: Thi$ is å title" -1: UC1 GitContext.current_branch: master +1: UC1 GitContext.current_branch: main 1: UC1 GitContext.commentchar: # -1: UC2 GitCommit.branches: ['master'] +1: UC2 GitCommit.branches: ['main'] 1: UC2 GitCommit.custom_prop: foöbar 1: UC4 int-öption: 2 1: UC4 str-öption: föo -- cgit v1.2.3