summaryrefslogtreecommitdiff
path: root/vendor/gitignore
diff options
context:
space:
mode:
authorBob Van Landuyt <bob@vanlanduyt.co>2018-08-08 09:28:55 +0200
committerBob Van Landuyt <bob@vanlanduyt.co>2018-08-08 09:28:55 +0200
commit5ff3e93720a1f55a8b515b2b74b7d14c99be4bc1 (patch)
treed37f6291356dc65d9dbe1eaaac0e11c2111ff0c9 /vendor/gitignore
parent4271325283cf4bb5fda5ffffbd4b8d1465834efa (diff)
downloadgitlab-ce-5ff3e93720a1f55a8b515b2b74b7d14c99be4bc1.tar.gz
Update templates for 11.2
Diffstat (limited to 'vendor/gitignore')
-rw-r--r--vendor/gitignore/Autotools.gitignore2
-rw-r--r--vendor/gitignore/Laravel.gitignore7
-rw-r--r--vendor/gitignore/VisualStudio.gitignore5
3 files changed, 8 insertions, 6 deletions
diff --git a/vendor/gitignore/Autotools.gitignore b/vendor/gitignore/Autotools.gitignore
index 96d6ed2cfea..f4f545c9ca4 100644
--- a/vendor/gitignore/Autotools.gitignore
+++ b/vendor/gitignore/Autotools.gitignore
@@ -16,6 +16,8 @@ autom4te.cache
/compile
/config.guess
/config.h.in
+/config.log
+/config.status
/config.sub
/configure
/configure.scan
diff --git a/vendor/gitignore/Laravel.gitignore b/vendor/gitignore/Laravel.gitignore
index a4854bef534..67e2146f2bc 100644
--- a/vendor/gitignore/Laravel.gitignore
+++ b/vendor/gitignore/Laravel.gitignore
@@ -1,6 +1,7 @@
vendor/
node_modules/
npm-debug.log
+yarn-error.log
# Laravel 4 specific
bootstrap/compiled.php
@@ -10,11 +11,7 @@ app/storage/
public/storage
public/hot
storage/*.key
-.env.*.php
-.env.php
.env
Homestead.yaml
Homestead.json
-
-# Rocketeer PHP task runner and deployment package. https://github.com/rocketeers/rocketeer
-.rocketeer/
+/.vagrant
diff --git a/vendor/gitignore/VisualStudio.gitignore b/vendor/gitignore/VisualStudio.gitignore
index f431ddc7cf5..94b41b913fb 100644
--- a/vendor/gitignore/VisualStudio.gitignore
+++ b/vendor/gitignore/VisualStudio.gitignore
@@ -59,7 +59,7 @@ StyleCopReport.xml
# Files built by Visual Studio
*_i.c
*_p.c
-*_i.h
+*_h.h
*.ilk
*.meta
*.obj
@@ -327,3 +327,6 @@ ASALocalRun/
# MFractors (Xamarin productivity tool) working folder
.mfractor/
+
+# Local History for Visual Studio
+.localhistory/