mirror of
https://gitlab.com/Chill-Projet/chill-bundles.git
synced 2025-10-31 09:18:24 +00:00
Julie Lenaerts
941acea4d9
# Conflicts: # src/Bundle/ChillEventBundle/Controller/EventController.php # src/Bundle/ChillEventBundle/Controller/ParticipationController.php # src/Bundle/ChillEventBundle/DependencyInjection/ChillEventExtension.php # src/Bundle/ChillEventBundle/Entity/Event.php # src/Bundle/ChillEventBundle/Form/EventType.php # src/Bundle/ChillEventBundle/Menu/AdminMenuBuilder.php # src/Bundle/ChillEventBundle/config/services.yaml # src/Bundle/ChillEventBundle/config/services/controller.yaml # src/Bundle/ChillMainBundle/Resources/views/Menu/user.html.twig # src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodWorkDuplicateController.php # src/Bundle/ChillPersonBundle/Controller/PersonController.php # src/Bundle/ChillPersonBundle/Form/PersonType.php
65 lines
1.2 KiB
Plaintext
65 lines
1.2 KiB
Plaintext
.composer/*
|
|
composer
|
|
composer.phar
|
|
composer.lock
|
|
docs/build/
|
|
.php_cs.cache
|
|
.cache/*
|
|
yarn.lock
|
|
|
|
docker/db/data
|
|
docker/rabbitmq/data
|
|
|
|
# in this development bundle, we want to ignore directories related to a real app
|
|
assets/*
|
|
!assets/translator.ts
|
|
!assets/ux-translator
|
|
migrations/*
|
|
templates/*
|
|
translations/*
|
|
|
|
# we allow developers to add customization on their installation, without commiting it
|
|
config/packages/dev/*
|
|
|
|
###> symfony/framework-bundle ###
|
|
/.env.local
|
|
/.env.local.php
|
|
/.env.*.local
|
|
/config/secrets/prod/prod.decrypt.private.php
|
|
/public/bundles/
|
|
/var/
|
|
/vendor/
|
|
###< symfony/framework-bundle ###
|
|
|
|
###> phpunit/phpunit ###
|
|
/phpunit.xml
|
|
/.phpunit.cache/
|
|
###< phpunit/phpunit ###
|
|
|
|
/.php-cs-fixer.cache
|
|
/.idea/
|
|
/.psalm/
|
|
|
|
###> phpstan/phpstan ###
|
|
phpstan.neon
|
|
###< phpstan/phpstan ###
|
|
|
|
###> lexik/jwt-authentication-bundle ###
|
|
/config/jwt/*.pem
|
|
###< lexik/jwt-authentication-bundle ###
|
|
|
|
###> symfony/phpunit-bridge ###
|
|
###< symfony/phpunit-bridge ###
|
|
|
|
###> symfony/webpack-encore-bundle ###
|
|
/node_modules/
|
|
/public/build/
|
|
npm-debug.log
|
|
yarn-error.log
|
|
###< symfony/webpack-encore-bundle ###
|
|
|
|
###> friendsofphp/php-cs-fixer ###
|
|
/.php-cs-fixer.php
|
|
/.php-cs-fixer.cache
|
|
###< friendsofphp/php-cs-fixer ###
|