Merge pull request #4834 from wispgitgecko9/patch-2

Update macOS.gitignore
Revert change to Icon rule
2026-11-06 10:00:40 +01:00 · 2026-04-07 20:04:22 -07:00 · 2026-04-07 20:02:07 -07:00 · 2026-04-06 09:43:23 -07:00 · 2026-04-06 09:41:52 -07:00 · 2026-04-06 18:38:27 +02:00
7 changed files with 57 additions and 78 deletions
@@ -49,14 +49,14 @@ CMakeFiles/
 CMakeCache.txt
 cmake_install.cmake
 Makefile
-install_manifest.txt 
+install_manifest.txt
 compile_commands.json
 # Temporary files
-*.tmp 
+*.tmp
-*.log 
+*.log
-*.bak 
+*.bak
-*.swp 
+*.swp
 # vcpkg
 vcpkg_installed/
@@ -66,4 +66,4 @@ vcpkg_installed/
 # test output & cache
 Testing/
-.cache/
+.cache/
@@ -1,5 +1,6 @@
 # General
 .DS_Store
 .localized
 __MACOSX/
 .AppleDouble
 .LSOverride
@@ -7,7 +7,7 @@ release.properties
 dependency-reduced-pom.xml
 buildNumber.properties
 .mvn/timing.properties
-# https://maven.apache.org/wrapper/#usage-without-binary-jar
+# https://maven.apache.org/tools/wrapper/#Usage_with_or_without_Binary_JAR
 .mvn/wrapper/maven-wrapper.jar
 # Eclipse m2e generated files
@@ -4,3 +4,6 @@ result-*
 # Ignore automatically generated direnv output
 .direnv
 # Ignore NixOS interactive test driver history
 **/.nixos-test-history
@@ -1,30 +1,52 @@
-# Composer
+# Cache and logs (Symfony2)
-/vendor/
+/app/cache/*
-/composer.phar
+/app/logs/*
 !app/cache/.gitkeep
 !app/logs/.gitkeep
-# Cache, session files and logs
+# Email spool folder
 /app/spool/*
 # Cache, session files and logs (Symfony3)
 /var/cache/*
-/var/log/*
+/var/logs/*
 /var/sessions/*
 !var/cache/.gitkeep
-!var/log/.gitkeep
+!var/logs/.gitkeep
 !var/sessions/.gitkeep
-# Env vars & Secrets
+# Logs (Symfony4)
-/.env.local
+/var/log/*
-/.env.local.php
+!var/log/.gitkeep
 /.env.*.local
 /config/secrets/prod/prod.decrypt.private.php
-# Bundles assets
+# Parameters
-/public/bundles/
+/app/config/parameters.yml
 /app/config/parameters.ini
-# Webpack Encore
+# Managed by Composer
-/node_modules/
+/app/bootstrap.php.cache
-npm-debug.log
+/var/bootstrap.php.cache
-yarn-error.log
+/bin/*
 !bin/console
 !bin/symfony_requirements
 /vendor/
 # Assets and user uploads
 /web/bundles/
 /web/uploads/
 # PHPUnit
-.phpunit.result.cache
+/app/phpunit.xml
 /phpunit.xml
-/phpunit.xml.dist
+
 # Build data
 /build/
 # Composer PHAR
 /composer.phar
 # Backup entities generated with doctrine:generate:entities command
 **/Entity/*~
 # Embedded web-server pid file
 /.web-server-pid
@@ -75,6 +75,11 @@ acs-*.bib
 # comment
 *.cut
 # context
 *.tuc
 *.tui
 *.tuo
 # cprotect
 *.cpt
@@ -1,52 +0,0 @@
 # Cache and logs (Symfony2)
 /app/cache/*
 /app/logs/*
 !app/cache/.gitkeep
 !app/logs/.gitkeep
 # Email spool folder
 /app/spool/*
 # Cache, session files and logs (Symfony3)
 /var/cache/*
 /var/logs/*
 /var/sessions/*
 !var/cache/.gitkeep
 !var/logs/.gitkeep
 !var/sessions/.gitkeep
 # Logs (Symfony4)
 /var/log/*
 !var/log/.gitkeep
 # Parameters
 /app/config/parameters.yml
 /app/config/parameters.ini
 # Managed by Composer
 /app/bootstrap.php.cache
 /var/bootstrap.php.cache
 /bin/*
 !bin/console
 !bin/symfony_requirements
 /vendor/
 # Assets and user uploads
 /web/bundles/
 /web/uploads/
 # PHPUnit
 /app/phpunit.xml
 /phpunit.xml
 # Build data
 /build/
 # Composer PHAR
 /composer.phar
 # Backup entities generated with doctrine:generate:entities command
 **/Entity/*~
 # Embedded web-server pid file
 /.web-server-pid
Author	SHA1	Message	Date
Devin Dooley	c677dd99d4	Merge pull request #4834 from wispgitgecko9/patch-2 Update macOS.gitignore	2026-04-07 20:04:22 -07:00
Devin Dooley	a78658650d	Revert change to Icon rule	2026-04-07 20:02:07 -07:00
Devin Dooley	e9c620b9f6	Merge pull request #4837 from haras-unicorn/feat-nix-ignore-nixos-test-history feat(nix): ignore nixos test history	2026-04-06 09:43:23 -07:00
Devin Dooley	5853962226	Merge pull request #4826 from gxono/patch-1 TeX: add ConTeXt utility cache file (.tuc, .tui & tuo)	2026-04-06 09:41:52 -07:00
haras	c5bf3caf29	feat(nix): ignore nixos test history	2026-04-06 18:38:27 +02:00
Devin Dooley	7514684825	Merge pull request #4835 from ysmartin/patch-1 Fix comment URL for Maven wrapper usage	2026-04-06 09:32:48 -07:00
Devin Dooley	ad49657df2	Merge pull request #4836 from T1ckbase/fix/cpp-gitignore-whitespace Remove trailing whitespace in C++.gitignore	2026-04-06 09:30:03 -07:00
T1ckbase	9ffced6030	Remove remaining trailing whitespace in C++.gitignore	2026-04-05 03:24:04 +08:00
T1ckbase	49990d1d63	Remove trailing whitespace in C++.gitignore	2026-04-05 03:15:27 +08:00
ysmartin	3d21cef359	Fix comment URL for Maven wrapper usage Updated the URL and fragment in the comment for Maven wrapper usage.	2026-04-04 14:47:28 +02:00
WiSP	6a7b122e75	Update macOS.gitignore Added .localized file to the gitignore.	2026-04-03 21:59:36 -05:00
Jonatán Perren	de90107f1a	TeX: add ConTeXt utility cache file (.tuc, .tui & tuo) ConTeXt generates .tuc files (utility cache) during each run. These can be removed using the command line [--purgeall](https://wiki.contextgarden.net/Input_and_compilation/Executable_scripts_and_auxiliary_files/context_script#--purgeall). ConTeXt MKII generates .tui and .tuo with the generation of [ToC](https://wiki.contextgarden.net/Document_structure_and_headlines/Table_of_contents). These files store document metadata between compilations and are not part of the source, so they should be ignored.	2026-04-03 22:06:17 -03:00
Jonatán Perren	9aa86b4610	TeX: add ConTeXt utility cache file (.tua & .tuc) ConTeXt generates .tua and .tuc files (utility cache) during each run. These files store document metadata between compilations and are not part of the source, so they should be ignored.	2026-03-27 21:24:28 -03:00