From 66703b30b3ab975839a40ab54b65777086683f8b Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 8 Jan 2016 14:27:05 +0100 Subject: [PATCH] Updated git files after laravel 5.2 upgrade --- .gitattributes | 2 + .gitignore | 39 +++---------------- app/{Handlers/Commands => Listeners}/.gitkeep | 0 app/{Handlers/Events => Policies}/.gitkeep | 0 bootstrap/cache/.gitignore | 0 build/logs/.gitignore | 2 - database/.gitignore | 2 +- database/migrations/.gitkeep | 0 database/seeds/.gitkeep | 0 resources/views/vendor/.gitkeep | 0 storage/.gitignore | 1 - storage/app/.gitignore | 2 +- storage/database/.gitignore | 1 - storage/debugbar/.gitignore | 2 - storage/framework/.gitignore | 1 + storage/framework/cache/.gitignore | 2 +- storage/framework/sessions/.gitignore | 0 storage/framework/views/.gitignore | 0 storage/logs/.gitignore | 0 storage/upload/.gitignore | 2 - tests/_output/.gitignore | 2 - 21 files changed, 12 insertions(+), 46 deletions(-) mode change 100644 => 100755 .gitattributes mode change 100644 => 100755 .gitignore rename app/{Handlers/Commands => Listeners}/.gitkeep (100%) mode change 100644 => 100755 rename app/{Handlers/Events => Policies}/.gitkeep (100%) mode change 100644 => 100755 mode change 100644 => 100755 bootstrap/cache/.gitignore delete mode 100644 build/logs/.gitignore mode change 100644 => 100755 database/.gitignore mode change 100644 => 100755 database/migrations/.gitkeep mode change 100644 => 100755 database/seeds/.gitkeep create mode 100755 resources/views/vendor/.gitkeep delete mode 100644 storage/.gitignore mode change 100644 => 100755 storage/app/.gitignore delete mode 100644 storage/database/.gitignore delete mode 100644 storage/debugbar/.gitignore mode change 100644 => 100755 storage/framework/.gitignore mode change 100644 => 100755 storage/framework/cache/.gitignore mode change 100644 => 100755 storage/framework/sessions/.gitignore mode change 100644 => 100755 storage/framework/views/.gitignore mode change 100644 => 100755 storage/logs/.gitignore delete mode 100644 storage/upload/.gitignore delete mode 100644 tests/_output/.gitignore diff --git a/.gitattributes b/.gitattributes old mode 100644 new mode 100755 index 176a458f94..95883deab5 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,3 @@ * text=auto +*.css linguist-vendored +*.less linguist-vendored diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 index 5cb379f496..24797db2e7 --- a/.gitignore +++ b/.gitignore @@ -1,36 +1,9 @@ -/bootstrap/compiled.php /vendor -composer.phar -Thumbs.db -.idea/ -tests/_output/* -_ide_helper.php -/build/logs -index.html* -app/storage/firefly-export* -.vagrant -firefly-iii-import-*.json -tests/_output/* -testing.sqlite -_ide_helper_models.php -clean.sqlite -tests/acceptance/AcceptanceTester.php -tests/functional/FunctionalTester.php -tests/unit/UnitTester.php -pi.php -tests/_data/db.sqlite -tests/_data/dump.sql -db.sqlite_snapshot -c3.php -db.sqlite-journal -tests/_output/* +/node_modules +Homestead.yaml +Homestead.json .env -clover.xml -node_modules/ -addNewLines.php +.idea/ +_ide_helper.php +_ide_helper_models.php .phpstorm.meta.php -.env.backup -.env.local - -tests/_output/* -tests/_output/* diff --git a/app/Handlers/Commands/.gitkeep b/app/Listeners/.gitkeep old mode 100644 new mode 100755 similarity index 100% rename from app/Handlers/Commands/.gitkeep rename to app/Listeners/.gitkeep diff --git a/app/Handlers/Events/.gitkeep b/app/Policies/.gitkeep old mode 100644 new mode 100755 similarity index 100% rename from app/Handlers/Events/.gitkeep rename to app/Policies/.gitkeep diff --git a/bootstrap/cache/.gitignore b/bootstrap/cache/.gitignore old mode 100644 new mode 100755 diff --git a/build/logs/.gitignore b/build/logs/.gitignore deleted file mode 100644 index 67c51fe2b0..0000000000 --- a/build/logs/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*.xml -*.json diff --git a/database/.gitignore b/database/.gitignore old mode 100644 new mode 100755 index 8b13789179..9b1dffd90f --- a/database/.gitignore +++ b/database/.gitignore @@ -1 +1 @@ - +*.sqlite diff --git a/database/migrations/.gitkeep b/database/migrations/.gitkeep old mode 100644 new mode 100755 diff --git a/database/seeds/.gitkeep b/database/seeds/.gitkeep old mode 100644 new mode 100755 diff --git a/resources/views/vendor/.gitkeep b/resources/views/vendor/.gitkeep new file mode 100755 index 0000000000..e69de29bb2 diff --git a/storage/.gitignore b/storage/.gitignore deleted file mode 100644 index 4ca7e82b3a..0000000000 --- a/storage/.gitignore +++ /dev/null @@ -1 +0,0 @@ -laravel.log diff --git a/storage/app/.gitignore b/storage/app/.gitignore old mode 100644 new mode 100755 index d6b7ef32c8..c96a04f008 --- a/storage/app/.gitignore +++ b/storage/app/.gitignore @@ -1,2 +1,2 @@ * -!.gitignore +!.gitignore \ No newline at end of file diff --git a/storage/database/.gitignore b/storage/database/.gitignore deleted file mode 100644 index 98e6ef67fa..0000000000 --- a/storage/database/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.db diff --git a/storage/debugbar/.gitignore b/storage/debugbar/.gitignore deleted file mode 100644 index d6b7ef32c8..0000000000 --- a/storage/debugbar/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore diff --git a/storage/framework/.gitignore b/storage/framework/.gitignore old mode 100644 new mode 100755 index 1670e90661..953edb7a99 --- a/storage/framework/.gitignore +++ b/storage/framework/.gitignore @@ -4,3 +4,4 @@ compiled.php services.json events.scanned.php routes.scanned.php +down diff --git a/storage/framework/cache/.gitignore b/storage/framework/cache/.gitignore old mode 100644 new mode 100755 index d6b7ef32c8..c96a04f008 --- a/storage/framework/cache/.gitignore +++ b/storage/framework/cache/.gitignore @@ -1,2 +1,2 @@ * -!.gitignore +!.gitignore \ No newline at end of file diff --git a/storage/framework/sessions/.gitignore b/storage/framework/sessions/.gitignore old mode 100644 new mode 100755 diff --git a/storage/framework/views/.gitignore b/storage/framework/views/.gitignore old mode 100644 new mode 100755 diff --git a/storage/logs/.gitignore b/storage/logs/.gitignore old mode 100644 new mode 100755 diff --git a/storage/upload/.gitignore b/storage/upload/.gitignore deleted file mode 100644 index d6b7ef32c8..0000000000 --- a/storage/upload/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore diff --git a/tests/_output/.gitignore b/tests/_output/.gitignore deleted file mode 100644 index d6b7ef32c8..0000000000 --- a/tests/_output/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore