Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions .dockerignore

This file was deleted.

28 changes: 13 additions & 15 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -16,27 +16,25 @@
*.yml text

# Ensure those won't be messed up with
*.phar binary
*.png binary
*.jpg binary
*.gif binary
*.ttf binary

# Ignore some meta files when creating an archive of this repository
/.github export-ignore
/.editorconfig export-ignore
/.gitattributes export-ignore
/.gitignore export-ignore
/.dockerignore export-ignore
/.phpunit-watcher.yml export-ignore
/.styleci.yml export-ignore
/infection.json.dist export-ignore
/psalm.xml export-ignore
/phpunit.xml.dist export-ignore
/Makefile export-ignore
/tests export-ignore
/docs export-ignore
# Exclude development and metadata files from distribution archive
* export-ignore
/config/ -export-ignore
/config/** -export-ignore
/src/ -export-ignore
/src/** -export-ignore
/stubs/ -export-ignore
/stubs/** -export-ignore
/CHANGELOG.md -export-ignore
/composer.json -export-ignore
/LICENSE.md -export-ignore
/README.md -export-ignore

# Avoid merge conflicts in CHANGELOG
# https://about.gitlab.com/2015/02/10/gitlab-reduced-merge-conflicts-by-90-percent-with-changelog-placeholders/
/CHANGELOG.md merge=union

Loading