Merge pull request #12628 from nupplaphil/bug/typeerror

[friendica.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index db1c3c1306498253b3694991dbc5a1fd9e393b38..3db593f1d4fcd8d28368ee00f2107090f26435ad 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,21 +1,22 @@
 favicon.*
-.htconfig.php
-.htpreconfig.php
+/.htconfig.php
+/.htpreconfig.php
 \#*
 *.log
 *.out
 *.version*
 home.html
-
 *~
 robots.txt
 
 #ignore local config
-/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/
@@ -32,6 +33,9 @@ report/
 #ignore NetBeans IDE's private files (at least)
 /nbproject/private/
 
+Ignore config files from VSCode
+/.vscode/
+
 #ignore smarty cache
 /view/smarty3/compiled/
 
@@ -67,5 +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