Merge pull request #12628 from nupplaphil/bug/typeerror

[friendica.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 2d8acf01607997b76c569c6576f319e1728ba828..3db593f1d4fcd8d28368ee00f2107090f26435ad 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -10,13 +10,13 @@ home.html
 robots.txt
 
 #ignore local config
-/config/local.config.php
-/config/addon.config.php
-/config/local.ini.php
-/config/addon.ini.php
+!/config/local-sample.config.php
+/config/*.config.php
+/config/*.ini.php
 
 #ignore documentation, it should be newly built
-/doc/html
+/doc/api
+/doc/cache
 
 #ignore reports, should be generated with every build
 report/
@@ -71,11 +71,29 @@ venv/
 /addons
 /addon
 
-#ignore .htaccess
-.htaccess
+#ignore base .htaccess
+/.htaccess
 
 #ignore filesystem storage default path
 /storage
 
 #Ignore log folder
 /log
+
+#Ignore temporary installed phpunit
+/bin/phpunit
+
+#Ignore cache file
+.php_cs.cache
+
+#ignore avatar picture cache path
+/avatar
+
+#Ignore autotest results
+autotest-results.xml
+
+#ignore phpunit result cache
+tests/.phpunit.result.cache
+
+#ignore .php_cs (local copy)
+.php_cs