From 74e84679ad3ac3b75594673e042a3a5bf595cfdd Mon Sep 17 00:00:00 2001 From: Vitor Trigo Date: Wed, 16 Oct 2019 17:19:01 -0300 Subject: [PATCH 1/4] Update Laravel 6 --- .gitignore | 2 ++ composer.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..df30947 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ + +.idea/ diff --git a/composer.json b/composer.json index fb16838..68f41f0 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ ], "require": { "php": ">=7.0.0", - "laravel/framework": "^5.5" + "laravel/framework": "^6.0" }, "autoload": { "psr-4": { From d284cc8c5e8bcc987528c0fd27a724b3f37c2166 Mon Sep 17 00:00:00 2001 From: Vitor Trigo Date: Wed, 16 Oct 2019 17:19:01 -0300 Subject: [PATCH 2/4] Revert "Update Laravel 6" This reverts commit 74e84679ad3ac3b75594673e042a3a5bf595cfdd. --- .gitignore | 2 -- composer.json | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) delete mode 100644 .gitignore diff --git a/.gitignore b/.gitignore deleted file mode 100644 index df30947..0000000 --- a/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ - -.idea/ diff --git a/composer.json b/composer.json index 68f41f0..fb16838 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ ], "require": { "php": ">=7.0.0", - "laravel/framework": "^6.0" + "laravel/framework": "^5.5" }, "autoload": { "psr-4": { From 963ea5309ff51536844d178f7686e0c0ffcff6bd Mon Sep 17 00:00:00 2001 From: Vitor Trigo Date: Wed, 16 Oct 2019 17:49:52 -0300 Subject: [PATCH 3/4] Update Laravel 6 --- .gitignore | 2 ++ composer.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..df30947 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ + +.idea/ diff --git a/composer.json b/composer.json index fb16838..578e393 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ ], "require": { "php": ">=7.0.0", - "laravel/framework": "^5.5" + "illuminate/support": "~5.0|^6.0" }, "autoload": { "psr-4": { From 44f57b6fc523c11eb87aa0115bd702dd197a8dd2 Mon Sep 17 00:00:00 2001 From: Fernando Miranda Date: Thu, 17 Oct 2019 15:18:51 -0300 Subject: [PATCH 4/4] Rmove .gitignore --- .gitignore | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 .gitignore diff --git a/.gitignore b/.gitignore deleted file mode 100644 index df30947..0000000 --- a/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ - -.idea/