GitLab

GIT_SILENT

GIT_SILENT

GIT_SILENT

GIT_SILENT

GIT_SILENT

GIT_SILENT

GIT_SILENT

GIT_SILENT

GIT_SILENT

Reviewers: kossebau, ngraham

Subscribers: kdevelop-devel

Tags: #kdevelop

Differential Revision: https://phabricator.kde.org/D23321

BUG: 410687

Avoids repeated conversion

code improvement done as exception in stable branch, as potentially there
will be more additions of the filter list here, where merging into
a changed code base only in master would become more work

Motivated by 58e6d4c6 this commit adds a few more standard files to
include in the project filter by default:

  -- gitlab, travis, circleCI CI config
  -- pre-commit commit hooks config
  -- pep8 (Python), prettier (JS, CSS, HTML formatter, see Prettier.io)
     linter/formatter configs
  -- .editorconfig file

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"

Some places rely on this being properly set due to using qobject_cast
for quick cross-casting.

BUG: 410820
FIXED-IN: 5.4.1

There are expand-all and collapse-all icons so use them.