Commit 487c9314 authored by Taylor Otwell's avatar Taylor Otwell

Merge branch 'master' into staging

parents 023dacf5 15982efd
...@@ -86,6 +86,7 @@ If you have created indexes on tables using the Laravel migration system and you ...@@ -86,6 +86,7 @@ If you have created indexes on tables using the Laravel migration system and you
Add the following to the **aliases** array in your **application/config/application.php** file: Add the following to the **aliases** array in your **application/config/application.php** file:
'Eloquent' => 'Laravel\\Database\\Eloquent\\Model', 'Eloquent' => 'Laravel\\Database\\Eloquent\\Model',
'Blade' => 'Laravel\\Blade',
### Update Eloquent many-to-many tables. ### Update Eloquent many-to-many tables.
...@@ -101,4 +102,16 @@ English pluralization and singularization is now automatic. Just completely repl ...@@ -101,4 +102,16 @@ English pluralization and singularization is now automatic. Just completely repl
### Add the **fetch** option to your database configuration file. ### Add the **fetch** option to your database configuration file.
A new **fetch** option allows you to specify in which format you receive your database results. Just copy and paste the option from the new **application/config/database.php** file. A new **fetch** option allows you to specify in which format you receive your database results. Just copy and paste the option from the new **application/config/database.php** file.
\ No newline at end of file
### Add **database** option to your Redis configuration.
If you are using Redis, add the "database" option to your Redis connection configurations. The "database" value can be zero by default.
'redis' => array(
'default' => array(
'host' => '127.0.0.1',
'port' => 6379,
'database' => 0
),
),
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment