Merge pull request #6976 from firefly-iii/fix-mergify

Fix mergify
This commit is contained in:
James Cole 2023-02-04 10:52:46 +01:00 committed by GitHub
commit 47a98451a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 51 additions and 44 deletions

93
.github/mergify.yml vendored
View File

@ -1,3 +1,4 @@
---
pull_request_rules: pull_request_rules:
- name: Close all on main - name: Close all on main
conditions: conditions:
@ -5,52 +6,58 @@ pull_request_rules:
- -author~=^dependabot(|-preview)\[bot\]$ - -author~=^dependabot(|-preview)\[bot\]$
actions: actions:
close: close:
message: Please do not open PR's on the `main` branch, but on the `develop` branch only. Thank you! message: Please do not open PR's on the `main` branch, but on the `develop`
branch only. Thank you!
- name: No translations - name: No translations
conditions: conditions:
- -author~=^dependabot(|-preview)\[bot\]$
- base=develop
- or: - or:
- -files=^resources/lang/bg_BG - files~=^resources/lang/bg_BG
- -files=^resources/lang/ca_ES - files~=^resources/lang/ca_ES
- -files=^resources/lang/cs_CZ - files~=^resources/lang/cs_CZ
- -files=^resources/lang/da_DK - files~=^resources/lang/da_DK
- -files=^resources/lang/de_DE - files~=^resources/lang/de_DE
- -files=^resources/lang/el_GR - files~=^resources/lang/el_GR
- -files=^resources/lang/en_GB - files~=^resources/lang/en_GB
- -files=^resources/lang/es_ES - files~=^resources/lang/es_ES
- -files=^resources/lang/et_EE - files~=^resources/lang/et_EE
- -files=^resources/lang/fa_IR - files~=^resources/lang/fa_IR
- -files=^resources/lang/fi_FI - files~=^resources/lang/fi_FI
- -files=^resources/lang/fr_FR - files~=^resources/lang/fr_FR
- -files=^resources/lang/he_IL - files~=^resources/lang/he_IL
- -files=^resources/lang/hu_HU - files~=^resources/lang/hu_HU
- -files=^resources/lang/id_ID - files~=^resources/lang/id_ID
- -files=^resources/lang/is_IS - files~=^resources/lang/is_IS
- -files=^resources/lang/it_IT - files~=^resources/lang/it_IT
- -files=^resources/lang/ja_JP - files~=^resources/lang/ja_JP
- -files=^resources/lang/ko_KR - files~=^resources/lang/ko_KR
- -files=^resources/lang/lt_LT - files~=^resources/lang/lt_LT
- -files=^resources/lang/nb_NO - files~=^resources/lang/nb_NO
- -files=^resources/lang/nl_NL - files~=^resources/lang/nl_NL
- -files=^resources/lang/pl_PL - files~=^resources/lang/pl_PL
- -files=^resources/lang/pt_BR - files~=^resources/lang/pt_BR
- -files=^resources/lang/pt_PT - files~=^resources/lang/pt_PT
- -files=^resources/lang/ro_RO - files~=^resources/lang/ro_RO
- -files=^resources/lang/ru_RU - files~=^resources/lang/ru_RU
- -files=^resources/lang/si_LK - files~=^resources/lang/si_LK
- -files=^resources/lang/sk_SK - files~=^resources/lang/sk_SK
- -files=^resources/lang/sl_SI - files~=^resources/lang/sl_SI
- -files=^resources/lang/sr_CS - files~=^resources/lang/sr_CS
- -files=^resources/lang/sv_SE - files~=^resources/lang/sv_SE
- -files=^resources/lang/th_TH - files~=^resources/lang/th_TH
- -files=^resources/lang/tlh_AA - files~=^resources/lang/tlh_AA
- -files=^resources/lang/tr_TR - files~=^resources/lang/tr_TR
- -files=^resources/lang/uk_UA - files~=^resources/lang/uk_UA
- -files=^resources/lang/vi_VN - files~=^resources/lang/vi_VN
- -files=^resources/lang/zh_CN - files~=^resources/lang/zh_CN
- -files=^resources/lang/zh_TW - files~=^resources/lang/zh_TW
actions: actions:
comment: comment:
message: | message: >
Please do not submit translated strings in your PR. If you need new sentences to be translated, add them to the `en_US` language strings. New or changed translations for other languages can be submitted at https://crowdin.com/project/firefly-iii Please do not submit translated strings in your PR. If you need new
sentences to be translated, add them to the `en_US` language strings.
New or changed translations for other languages can be submitted at
https://crowdin.com/project/firefly-iii
Thank you! Thank you!

View File

@ -81,7 +81,7 @@ trait JournalServiceTrait
// if result is NULL but IBAN is set, any result of the search by NAME can't overrule // if result is NULL but IBAN is set, any result of the search by NAME can't overrule
// this account. In such a case, the name search must be retried with a new name. // this account. In such a case, the name search must be retried with a new name.
if (null !== $result && null === $numberResult && null === $ibanResult && null !== $data['iban']) { if (null !== $result && null === $numberResult && null === $ibanResult && '' !== (string) $data['iban']) {
$data['name'] = sprintf('%s (%s)', $data['name'], $data['iban']); $data['name'] = sprintf('%s (%s)', $data['name'], $data['iban']);
Log::debug(sprintf('Search again using the new name, "%s".', $data['name'])); Log::debug(sprintf('Search again using the new name, "%s".', $data['name']));
$result = $this->findAccountByName(null, $data, $expectedTypes[$transactionType]); $result = $this->findAccountByName(null, $data, $expectedTypes[$transactionType]);