From 710884d4f518ac8b3c23bbec060433f8336defb5 Mon Sep 17 00:00:00 2001
From: Jeroen Deviaene <jerodev@users.noreply.github.com>
Date: Tue, 27 Oct 2015 23:05:02 +0100
Subject: [PATCH 1/5] Create gitignore for Lumen

---
 Lumen.gitignore | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 Lumen.gitignore

diff --git a/Lumen.gitignore b/Lumen.gitignore
new file mode 100644
index 00000000..0e042c23
--- /dev/null
+++ b/Lumen.gitignore
@@ -0,0 +1,8 @@
+.env.*.php
+.env.php
+.env
+.env.example
+
+vendor/
+node_modules/
+storage/

From f652ad762774e35b1553b8898dcc1154e819921d Mon Sep 17 00:00:00 2001
From: Jeroen Deviaene <jerodev@users.noreply.github.com>
Date: Tue, 27 Oct 2015 23:07:36 +0100
Subject: [PATCH 2/5] Create gitignore for Laravel5

In Laravel 5 the storage folder was moved to the root of the application. The compiled.php has also been moved to the bootstrap/cache directory

This was no longer compatible with the previous laravel.gitignore.
---
 Laravel5.gitignore | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 Laravel5.gitignore

diff --git a/Laravel5.gitignore b/Laravel5.gitignore
new file mode 100644
index 00000000..c895d944
--- /dev/null
+++ b/Laravel5.gitignore
@@ -0,0 +1,9 @@
+bootstrap/cache/
+.env.*.php
+.env.php
+.env
+.env.example
+
+vendor/
+node_modules/
+storage/

From 1d16414b1f8fe9ca10dd85596103566c663e07c4 Mon Sep 17 00:00:00 2001
From: jerodev <jeroen@deviaene.eu>
Date: Wed, 28 Oct 2015 08:43:54 +0100
Subject: [PATCH 3/5] Merged laravel and laravel5

---
 Laravel.gitignore  | 11 ++++++-----
 Laravel5.gitignore |  9 ---------
 2 files changed, 6 insertions(+), 14 deletions(-)
 delete mode 100644 Laravel5.gitignore

diff --git a/Laravel.gitignore b/Laravel.gitignore
index 79906c80..2a6c46de 100644
--- a/Laravel.gitignore
+++ b/Laravel.gitignore
@@ -1,10 +1,11 @@
-/bootstrap/compiled.php
+bootstrap/compiled.php
+bootstrap/cache
 .env.*.php
 .env.php
 .env
 .env.example
 
-/vendor
-/node_modules
-/app/storage
-
+app/storage/
+node_modules/
+storage/
+vendor/
\ No newline at end of file
diff --git a/Laravel5.gitignore b/Laravel5.gitignore
deleted file mode 100644
index c895d944..00000000
--- a/Laravel5.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-bootstrap/cache/
-.env.*.php
-.env.php
-.env
-.env.example
-
-vendor/
-node_modules/
-storage/

From 3a838f8640766d0a5894d700ce38c55477a63859 Mon Sep 17 00:00:00 2001
From: jerodev <jeroen@deviaene.eu>
Date: Wed, 28 Oct 2015 13:24:11 +0100
Subject: [PATCH 4/5] Merged Laravel & Lumen + grouped rules

---
 Laravel.gitignore | 15 +++++++++------
 Lumen.gitignore   |  8 --------
 2 files changed, 9 insertions(+), 14 deletions(-)
 delete mode 100644 Lumen.gitignore

diff --git a/Laravel.gitignore b/Laravel.gitignore
index 2a6c46de..0790dea4 100644
--- a/Laravel.gitignore
+++ b/Laravel.gitignore
@@ -1,11 +1,14 @@
+vendor/
+node_modules/
+
+# Laravel 4 specific
 bootstrap/compiled.php
+app/storage/
+
+# Laravel 5 & Lumen specific
 bootstrap/cache
+storage/
 .env.*.php
 .env.php
 .env
-.env.example
-
-app/storage/
-node_modules/
-storage/
-vendor/
\ No newline at end of file
+.env.example
\ No newline at end of file
diff --git a/Lumen.gitignore b/Lumen.gitignore
deleted file mode 100644
index 0e042c23..00000000
--- a/Lumen.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-.env.*.php
-.env.php
-.env
-.env.example
-
-vendor/
-node_modules/
-storage/

From 5dda2849bff44c22d9813c56c869f4c18bdc55d9 Mon Sep 17 00:00:00 2001
From: jerodev <jeroen@deviaene.eu>
Date: Wed, 28 Oct 2015 13:28:46 +0100
Subject: [PATCH 5/5] missed slash in laravel.gitignore

---
 Laravel.gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Laravel.gitignore b/Laravel.gitignore
index 0790dea4..b4b05113 100644
--- a/Laravel.gitignore
+++ b/Laravel.gitignore
@@ -6,7 +6,7 @@ bootstrap/compiled.php
 app/storage/
 
 # Laravel 5 & Lumen specific
-bootstrap/cache
+bootstrap/cache/
 storage/
 .env.*.php
 .env.php