Merge remote-tracking branch 'origin/5.8' into features/database_url

laravel · Apr 25, 2019 · fb73271 · fb73271
2 parents f7dc3f4 + 4cdd824
commit fb73271
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/CHANGELOG-5.8.md b/CHANGELOG-5.8.md
@@ -1,13 +1,23 @@
 # Release Notes for 5.8.x
 
-## [Unreleased](https://github.com/laravel/framework/compare/v5.8.13...5.8)
+## [Unreleased](https://github.com/laravel/framework/compare/v5.8.14...5.8)
+
+
+## [v5.8.14 (2019-04-23)](https://github.com/laravel/framework/compare/v5.8.13...v5.8.14)
+
+### Added
+- Implemented `Job Based Retry Delay` ([#28265](https://github.com/laravel/framework/pull/28265))
 
 ### Changed
 - Update auth stubs with `@error` blade directive ([#28273](https://github.com/laravel/framework/pull/28273))
+- Convert email data tables to layout tables ([#28286](https://github.com/laravel/framework/pull/28286))
+
+### Reverted
+- Partial reverted [ability of register custom Doctrine DBAL](https://github.com/laravel/framework/pull/28214), since of [#28282](https://github.com/laravel/framework/issues/28282) issue ([#28301](https://github.com/laravel/framework/pull/28301))
+
+### Refactoring
+- Replace code with `Null Coalescing Operator` ([#28280](https://github.com/laravel/framework/pull/28280), [#28287](https://github.com/laravel/framework/pull/28287))
 
-### TODO:
-- Job Based Retry Delay ([#28265](https://github.com/laravel/framework/pull/28265))
-- Use Null Coalesce Operator ([#28280](https://github.com/laravel/framework/pull/28280))
 
 ## [v5.8.13 (2019-04-18)](https://github.com/laravel/framework/compare/v5.8.12...v5.8.13)
 

diff --git a/src/Illuminate/Database/Connection.php b/src/Illuminate/Database/Connection.php
@@ -1118,7 +1118,7 @@ public function unsetEventDispatcher()
     }
 
     /**
-     * Determine if the connection in a "dry run".
+     * Determine if the connection is in a "dry run".
      *
      * @return bool
      */

diff --git a/src/Illuminate/Foundation/Application.php b/src/Illuminate/Foundation/Application.php
@@ -29,7 +29,7 @@ class Application extends Container implements ApplicationContract, HttpKernelIn
      *
      * @var string
      */
-    const VERSION = '5.8.13';
+    const VERSION = '5.8.14';
 
     /**
      * The base path for the Laravel installation.
-Original file line number
+Diff line change
@@ Expand Up / @@ -1118,7 +1118,7 @@ public function unsetEventDispatcher() @@
         }
         /**
-         * Determine if the connection in a "dry run".
+         * Determine if the connection is in a "dry run".
          *
          * @return bool
          */
@@ Expand Down @@