GitLab

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"

This reverts commit 6c10959b.

Fun: MR was not approved. I was against (as maintainer), but it was merged...
=> revert.

While it is important to show this bar for HTML messages since a
malicious HTML mail could do evil things. The risk on plain text message
is less important, so hide the bar on plain text message.

Volker Krause authored Aug 22, 2021 and Laurent Montel committed Aug 24, 2021

Those are provided by the CMake macros from Akonadi nowadays, and that's
also what the CI is using now.

This broke as part of the port to the new plugin loader API, apparently
the semantics of the meta data API changed slightly.

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