Tweaks and fixes
This commit is contained in:
+3
-1
@@ -1,8 +1,10 @@
|
|||||||
* text=auto
|
* text=auto
|
||||||
|
|
||||||
|
/docs export-ignore
|
||||||
/tests export-ignore
|
/tests export-ignore
|
||||||
/.gitattributes export-ignore
|
/.gitattributes export-ignore
|
||||||
/.gitignore export-ignore
|
/.gitignore export-ignore
|
||||||
/phpunit.xml export-ignore
|
/phpunit.xml export-ignore
|
||||||
/README.md export-ignore
|
|
||||||
/CONTRIBUTING.md export-ignore
|
/CONTRIBUTING.md export-ignore
|
||||||
|
/INSTALL.md export-ignore
|
||||||
|
/README.md export-ignore
|
||||||
|
|||||||
@@ -71,4 +71,4 @@ App::down(function () {
|
|||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
require app_path('view-composers.php');
|
require app_path('composers.php');
|
||||||
|
|||||||
@@ -78,6 +78,8 @@ class Incident extends Model implements TransformableInterface
|
|||||||
return 'ion ion-eye';
|
return 'ion ion-eye';
|
||||||
case 4:
|
case 4:
|
||||||
return 'ion ion-checkmark';
|
return 'ion ion-checkmark';
|
||||||
|
default:
|
||||||
|
return '';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
namespace CachetHQ\Cachet\Models;
|
namespace CachetHQ\Cachet\Models;
|
||||||
|
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
use Illuminate\Support\Facades\Str;
|
use Illuminate\Support\Str;
|
||||||
use Watson\Validating\ValidatingTrait;
|
use Watson\Validating\ValidatingTrait;
|
||||||
|
|
||||||
class IncidentTemplate extends Model
|
class IncidentTemplate extends Model
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
namespace CachetHQ\Cachet\Models;
|
namespace CachetHQ\Cachet\Models;
|
||||||
|
|
||||||
|
use ErrorException;
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
|
||||||
class Setting extends Model
|
class Setting extends Model
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
namespace CachetHQ\Cachet\Models;
|
namespace CachetHQ\Cachet\Models;
|
||||||
|
|
||||||
|
use Exception;
|
||||||
use GuzzleHttp\Client;
|
use GuzzleHttp\Client;
|
||||||
use GuzzleHttp\Exception\ClientException;
|
use GuzzleHttp\Exception\ClientException;
|
||||||
use Illuminate\Database\Eloquent\Builder;
|
use Illuminate\Database\Eloquent\Builder;
|
||||||
@@ -52,11 +53,11 @@ class WebHook extends Model
|
|||||||
* Fires the actual web hook event.
|
* Fires the actual web hook event.
|
||||||
*
|
*
|
||||||
* @param string $eventType The event to send X-Cachet-Event
|
* @param string $eventType The event to send X-Cachet-Event
|
||||||
* @param mixed $data Data to send to the Web Hook
|
* @param string $data Data to send to the Web Hook
|
||||||
*
|
*
|
||||||
* @return \CachetHQ\Cachet\Models\WebHookResponse
|
* @return \CachetHQ\Cachet\Models\WebHookResponse
|
||||||
*/
|
*/
|
||||||
public function fire($eventType, $data = null)
|
public function fire($eventType, $data)
|
||||||
{
|
{
|
||||||
$startTime = microtime(true);
|
$startTime = microtime(true);
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -14,7 +14,7 @@ if (!function_exists('elixir')) {
|
|||||||
{
|
{
|
||||||
static $manifest = null;
|
static $manifest = null;
|
||||||
|
|
||||||
if (is_null($manifest)) {
|
if ($manifest === null) {
|
||||||
$manifest = json_decode(file_get_contents(public_path().'/build/rev-manifest.json'), true);
|
$manifest = json_decode(file_get_contents(public_path().'/build/rev-manifest.json'), true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user