Bug 35623 - createAndPromote.php: Change to allow promotion only

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

diff --git a/.gitignore b/.gitignore
index d3c56bc..ceff243 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,9 @@
 # Repository management
 .svn
 
+# git-deploy status file:
+/.deploy
+
 # Editors
 *.kate-swp
 *~
@@ -11,12 +14,14 @@ cscope.out
 ## NetBeans
 nbproject*
 project.index
+sublime-*
 
 # MediaWiki install & usage
 cache
 images/[0-9a-f]
 images/archive
 images/deleted
+images/lockdir
 images/temp
 images/thumb
 ## Extension:EasyTimeline
@@ -29,11 +34,19 @@ AdminSettings.php
 LocalSettings.php
 StartProfiler.php
 
+# Building & testing
+node_modules/
+
+# Composer
+/vendor
+/composer.lock
+/composer.json
+
 # Operating systems
 ## Mac OS X
 .DS_Store
 ## Windows
-thumbs.db
+Thumbs.db
 
 # Misc
 .buildpath