From 4dbfcac786b8d8bd87220a236bc6796bf651a071 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Kr=C3=B6g?= Date: Mon, 9 Mar 2026 22:02:19 +0100 Subject: [PATCH] Merge all git ignores into single file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maximilian Krög --- .gitignore | 57 +++++++++++++++++++++++++- app/.gitignore | 1 - app/cache/.gitignore | 2 - app/cache/.gitkeep | 0 docs/.gitignore | 6 --- public/js/.gitignore | 2 - public/js/.gitkeep | 0 public/setup/.gitignore | 4 -- public/themes/.gitignore | 7 ---- public/themes/bootstrap/css/.gitignore | 2 - public/themes/metro/css/.gitignore | 2 - public/themes/original/css/.gitignore | 2 - public/themes/pmahomme/css/.gitignore | 2 - tests/test_data/gis/.gitignore | 4 -- 14 files changed, 56 insertions(+), 35 deletions(-) delete mode 100644 app/.gitignore delete mode 100644 app/cache/.gitignore create mode 100644 app/cache/.gitkeep delete mode 100644 docs/.gitignore delete mode 100644 public/js/.gitignore create mode 100644 public/js/.gitkeep delete mode 100644 public/setup/.gitignore delete mode 100644 public/themes/.gitignore delete mode 100644 public/themes/bootstrap/css/.gitignore delete mode 100644 public/themes/metro/css/.gitignore delete mode 100644 public/themes/original/css/.gitignore delete mode 100644 public/themes/pmahomme/css/.gitignore delete mode 100644 tests/test_data/gis/.gitignore diff --git a/.gitignore b/.gitignore index be28e8504c..d504509e1b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,17 +1,22 @@ # Directory for creating releases /release/ + # Configuration files /config.inc.php /config.header.inc.php /config.footer.inc.php + # Upload/save dirs /upload/ /save/ /tmp/ + # For setup script /config/ + # ctags tags + # Editor files phpmyadmin.wpj .projectOptions @@ -24,43 +29,93 @@ phpmyadmin.wpj .netbeans .vscode *.sw[op] + # Web server files web.config .htaccess + # Locales /locale/ /resources/locale/ + # Temporary files to generate locales for Twig /twig-templates/ + # Backups *~ + # API documentation /apidoc/ +/docs/_build +/docs/doctrees +/docs/html /docs/linkcheck/ +/docs/locale +/docs/*.pyc +/docs/*.swp + # Demo server revision-info.php + # PHP_CodeSniffer phpcs.xml .phpcs-cache + # PHPUnit +.phpunit.result.cache phpunit.xml /tests/bootstrap.php -.phpunit.result.cache +/tests/gis/*-actual.json +/tests/gis/*-actual.pdf +/tests/gis/*-actual.png +/tests/gis/*-actual.svg + # Jenkins /build/ + # Netbeans ide stuff /nbproject/ + # Eclipse ide stuff /.pydevproject + # Ant cache cache.properties + # Composer /vendor/ + # NPM /node_modules/ phpstan.neon + # Infection infection.json5 /js/ /setup/ /themes/ + +# App +/app/cache/* +!/app/cache/.gitkeep +/app/language_stats_inc.php + +# public +/public/js/* +!/public/js/.gitkeep +/public/setup/*.css +/public/setup/*.css.map +/public/themes +!/public/themes/dot.gif +!/public/themes/bootstrap/ +!/public/themes/metro/ +!/public/themes/original/ +!/public/themes/pmahomme/ +/public/themes/bootstrap/*.css +/public/themes/bootstrap/*.css.map +/public/themes/metro/*.css +/public/themes/metro/*.css.map +/public/themes/original/*.css +/public/themes/original/*.css.map +/public/themes/pmahomme/*.css +/public/themes/pmahomme/*.css.map diff --git a/app/.gitignore b/app/.gitignore deleted file mode 100644 index ea4a1fdaff..0000000000 --- a/app/.gitignore +++ /dev/null @@ -1 +0,0 @@ -language_stats.inc.php diff --git a/app/cache/.gitignore b/app/cache/.gitignore deleted file mode 100644 index a68d087bfe..0000000000 --- a/app/cache/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/* -!/.gitignore diff --git a/app/cache/.gitkeep b/app/cache/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/docs/.gitignore b/docs/.gitignore deleted file mode 100644 index 4e0407bfa8..0000000000 --- a/docs/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -*.swp -/_build -/doctrees -/html -/locale -*.pyc diff --git a/public/js/.gitignore b/public/js/.gitignore deleted file mode 100644 index a68d087bfe..0000000000 --- a/public/js/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/* -!/.gitignore diff --git a/public/js/.gitkeep b/public/js/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/public/setup/.gitignore b/public/setup/.gitignore deleted file mode 100644 index ae62d5325b..0000000000 --- a/public/setup/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -styles.css -styles.css.map -styles.rtl.css -styles.rtl.css.map diff --git a/public/themes/.gitignore b/public/themes/.gitignore deleted file mode 100644 index a4ec19409a..0000000000 --- a/public/themes/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/* -!/.gitignore -!/dot.gif -!/original/ -!/pmahomme/ -!/metro/ -!/bootstrap/ diff --git a/public/themes/bootstrap/css/.gitignore b/public/themes/bootstrap/css/.gitignore deleted file mode 100644 index 84dae2be3a..0000000000 --- a/public/themes/bootstrap/css/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/*.css -/*.css.map diff --git a/public/themes/metro/css/.gitignore b/public/themes/metro/css/.gitignore deleted file mode 100644 index 84dae2be3a..0000000000 --- a/public/themes/metro/css/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/*.css -/*.css.map diff --git a/public/themes/original/css/.gitignore b/public/themes/original/css/.gitignore deleted file mode 100644 index 84dae2be3a..0000000000 --- a/public/themes/original/css/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/*.css -/*.css.map diff --git a/public/themes/pmahomme/css/.gitignore b/public/themes/pmahomme/css/.gitignore deleted file mode 100644 index 84dae2be3a..0000000000 --- a/public/themes/pmahomme/css/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/*.css -/*.css.map diff --git a/tests/test_data/gis/.gitignore b/tests/test_data/gis/.gitignore deleted file mode 100644 index 00d55b9047..0000000000 --- a/tests/test_data/gis/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -*-actual.json -*-actual.pdf -*-actual.png -*-actual.svg