From 458b62a72e38eebda3ea2f271203a93d1e751fe4 Mon Sep 17 00:00:00 2001 From: ecommerce-technician Date: Wed, 1 Jul 2015 09:52:56 -0700 Subject: [PATCH] Revert "merging fixes to master" --- .env | 19 +++++++++++++++++++ .gitignore | 3 --- app/Http/Controllers/GithubController.php | 2 +- 3 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 .env delete mode 100644 .gitignore diff --git a/.env b/.env new file mode 100644 index 00000000..7cb5863b --- /dev/null +++ b/.env @@ -0,0 +1,19 @@ +APP_ENV=local +APP_DEBUG=true +APP_KEY=kYaqdB9SGFsQ0BooG2FW29Xn7Ole4TUB + +DB_HOST=localhost +DB_DATABASE=homestead +DB_USERNAME=homestead +DB_PASSWORD=secret + +CACHE_DRIVER=file +SESSION_DRIVER=file +QUEUE_DRIVER=sync + +MAIL_DRIVER=smtp +MAIL_HOST=mailtrap.io +MAIL_PORT=2525 +MAIL_USERNAME=null +MAIL_PASSWORD=null +MAIL_ENCRYPTION=null \ No newline at end of file diff --git a/.gitignore b/.gitignore deleted file mode 100644 index cebcfc4a..00000000 --- a/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/vendor -Homestead.yaml -.env diff --git a/app/Http/Controllers/GithubController.php b/app/Http/Controllers/GithubController.php index 6fda033b..1cf48b4b 100644 --- a/app/Http/Controllers/GithubController.php +++ b/app/Http/Controllers/GithubController.php @@ -69,9 +69,9 @@ public function joyent() $table_maker .= '' . $line->commit_id . ''; } - $table_maker .= ''; + return view('pages.home', ['dump' => $table_maker]); }