Merge "Split limit report out of Parser::parse()"

[lhc/web/wiklou.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index b1649df..bb3a946 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -26,12 +26,15 @@ sftp-config.json
 /docs/js
 /images/[0-9a-f]
 /images/archive
+/images/cache
 /images/deleted
 /images/lockdir
 /images/temp
 /images/thumb
 ## Extension:EasyTimeline
 /images/timeline
+## Extension:Score
+/images/lilypond
 /images/tmp
 /maintenance/.mweval_history
 /maintenance/.mwsql_history
@@ -41,14 +44,15 @@ sftp-config.json
 /StartProfiler.php
 
 # Building & testing
+npm-debug.log
 node_modules/
 /tests/phpunit/phpunit.phar
 
 # Composer
 /vendor
 /composer.lock
-/composer.json
 /composer.local.json
+/composer.phar
 
 # MediaWiki UI documentation
 /docs/kss/static
@@ -70,3 +74,5 @@ Thumbs.db
 /tags
 /.htaccess
 /.htpasswd
+/tests/phan/issues
+*.rej