From 255c7d77d6cf23202469b783aae9c87bba12b017 Mon Sep 17 00:00:00 2001 From: Kevin Papst Date: Sat, 12 Oct 2024 23:45:13 +0200 Subject: [PATCH] Ignore files from showing up in a release (#5111) * moved email css files to template directory * prevent developer files from showing up in a release --- .gitattributes | 18 ++++++++++++++++++ CONTRIBUTING.md | 9 +++++---- SECURITY.md | 1 - assets/.gitignore | 0 config/packages/twig.yaml | 2 -- {assets => templates/emails}/css/emails.css | 0 templates/emails/layout.html.twig | 2 +- 7 files changed, 24 insertions(+), 8 deletions(-) create mode 100644 .gitattributes delete mode 100644 assets/.gitignore rename {assets => templates/emails}/css/emails.css (100%) diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..6ff874cb --- /dev/null +++ b/.gitattributes @@ -0,0 +1,18 @@ +.docker export-ignore +.github export-ignore +assets export-ignore +tests export-ignore +.codecov.yml export-ignore +.editorconfig export-ignore +.eslintrc.js export-ignore +.gitattributes export-ignore +.gitignore export-ignore +php-cs-fixer.dist.php export-ignore +babel.config.js export-ignore +package.json export-ignore +php-cs-fixer.sh export-ignore +phpstan.neon export-ignore +phpstan.sh export-ignore +phpunit.xml.dist export-ignore +webpack.config.js export-ignore +yarn.lock export-ignore \ No newline at end of file diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f8416469..22e4aa64 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,15 +1,16 @@ # Contributing -Kimai is an open source project, contributions made by the community are welcome. +Kimai is an open source project, contributions made by the community are welcome. +But we can only accept contributions with a signed CLA (Contributor License Agreement) to prevent issues in the future (you will see a link when opening a PR). + Send your ideas, code reviews, pull requests and feature requests to help to improve this project. ## Pull request rules +- Make your changes in a new git branch, based on the latest code in `main` - Apply our code-style by running `composer codestyle-fix` - Run the static code analysis with `composer phpstan` -- Verify everything still works with `composer tests-unit` and `composer tests-integration` +- Verify everything still works with `composer tests-unit` - Add tests for your changes -- When sending in a PR, you must accept that your contributions/code will be published under MIT license (see the [LICENSE](LICENSE) file as well), otherwise your PR will be closed -- If one of the PR checks/builds fails, fix it before asking for a review Further documentation can be found in the [developer documentation](https://www.kimai.org/documentation/developers.html). diff --git a/SECURITY.md b/SECURITY.md index 380772c6..dffe63c6 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -7,5 +7,4 @@ As announced in the [README](README.md) security fixes will only be added to the | main branch | :white_check_mark: | | older releases | :x: | - You find all information in our [Bughunter documentation](https://www.kimai.org/documentation/bughunter.html). diff --git a/assets/.gitignore b/assets/.gitignore deleted file mode 100644 index e69de29b..00000000 diff --git a/config/packages/twig.yaml b/config/packages/twig.yaml index 410a41af..90a44203 100644 --- a/config/packages/twig.yaml +++ b/config/packages/twig.yaml @@ -5,7 +5,5 @@ twig: - 'form/vertical.html.twig' exception_controller: null paths: - # used in templates/emails/layout.html.twig - '%kernel.project_dir%/assets/css': css '%kernel.project_dir%/templates/bundles/TablerBundle': theme '%kernel.project_dir%/vendor/kevinpapst/tabler-bundle/templates': theme diff --git a/assets/css/emails.css b/templates/emails/css/emails.css similarity index 100% rename from assets/css/emails.css rename to templates/emails/css/emails.css diff --git a/templates/emails/layout.html.twig b/templates/emails/layout.html.twig index 547cc2f7..32171f46 100644 --- a/templates/emails/layout.html.twig +++ b/templates/emails/layout.html.twig @@ -1,4 +1,4 @@ -{% apply inky_to_html|inline_css(source('@css/emails.css')) %} +{% apply inky_to_html|inline_css(source('emails/css/emails.css')) %}