GitLab

GIT_SILENT

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

A more thorough cleanup will be done in master.

Friedrich W. H. Kossebau authored Aug 21, 2021 and Laurent Montel committed Aug 22, 2021

TemplateParserJob got a new property replyAsHtml, by default false.
Only if set to true will the value of
TemplateParserSettings::replyUsingVisualFormat be respected.
That one though is false by default as well, only true if another test
set if before (happens on normal test runs), si it gets explicitly set
as well.

Otherwise setting changes influence tests run afterwards, which results
in surprises when running tests individually

GIT_SILENT

Also solves random failing of messagecomposer-autocryptheadersjobtest

GIT_SILENT

Found by MessageFactoryTest::testCreateMDN being broken

CCBUG: 440635

BUG: 440541

Fix Bug 439218 - Quoted strings containing comma or brackets are not parsed correctly, causes message sending to fail

BUG: 439218
FIXED-IN: 5.18.0

This caused asserts when interacting with the message viewer.

Bug found by Albert