]> BookStack Code Mirror - bookstack/commitdiff
Merge pull request #8 from BookStackApp/master
authorAbijeet Patro <redacted>
Sat, 25 Mar 2017 18:26:05 +0000 (23:56 +0530)
committerGitHub <redacted>
Sat, 25 Mar 2017 18:26:05 +0000 (23:56 +0530)
Getting the latest changes.

1  2 
config/database.php

diff --combined config/database.php
index cfeeaa75a25d8b40d6080d10e6f7993c47459255,92c7682450a68317015e6559380e34cfeaf414db..d13268cea44f8cbf7b77d211dd7dad66b7cf1d5e
@@@ -71,9 -71,9 +71,9 @@@ return 
          'mysql' => [
              'driver'    => 'mysql',
              'host'      => env('DB_HOST', 'localhost'),
 -            'database'  => env('DB_DATABASE', 'forge'),
 -            'username'  => env('DB_USERNAME', 'forge'),
 -            'password'  => env('DB_PASSWORD', ''),
 +            'database'  => env('DB_DATABASE', 'bookstack'),
 +            'username'  => env('DB_USERNAME', 'root'),
 +            'password'  => env('DB_PASSWORD', 'Change123'),
              'charset'   => 'utf8',
              'collation' => 'utf8_unicode_ci',
              'prefix'    => '',
@@@ -82,7 -82,7 +82,7 @@@
  
          'mysql_testing' => [
              'driver'    => 'mysql',
-             'host'      => 'localhost',
+             'host'      => '127.0.0.1',
              'database'  => 'bookstack-test',
              'username'  => env('MYSQL_USER', 'bookstack-test'),
              'password'  => env('MYSQL_PASSWORD', 'bookstack-test'),