mirror of
https://github.com/CachetHQ/Cachet.git
synced 2025-01-17 05:28:18 +01:00
Tweaks and fixes
This commit is contained in:
parent
0ccb5e289c
commit
ef98408a42
4
.gitattributes
vendored
4
.gitattributes
vendored
@ -1,8 +1,10 @@
|
||||
* text=auto
|
||||
|
||||
/docs export-ignore
|
||||
/tests export-ignore
|
||||
/.gitattributes export-ignore
|
||||
/.gitignore export-ignore
|
||||
/phpunit.xml export-ignore
|
||||
/README.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';
|
||||
case 4:
|
||||
return 'ion ion-checkmark';
|
||||
default:
|
||||
return '';
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -3,7 +3,7 @@
|
||||
namespace CachetHQ\Cachet\Models;
|
||||
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Support\Facades\Str;
|
||||
use Illuminate\Support\Str;
|
||||
use Watson\Validating\ValidatingTrait;
|
||||
|
||||
class IncidentTemplate extends Model
|
||||
|
@ -2,6 +2,7 @@
|
||||
|
||||
namespace CachetHQ\Cachet\Models;
|
||||
|
||||
use ErrorException;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
|
||||
class Setting extends Model
|
||||
|
@ -2,6 +2,7 @@
|
||||
|
||||
namespace CachetHQ\Cachet\Models;
|
||||
|
||||
use Exception;
|
||||
use GuzzleHttp\Client;
|
||||
use GuzzleHttp\Exception\ClientException;
|
||||
use Illuminate\Database\Eloquent\Builder;
|
||||
@ -52,11 +53,11 @@ class WebHook extends Model
|
||||
* Fires the actual web hook 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
|
||||
*/
|
||||
public function fire($eventType, $data = null)
|
||||
public function fire($eventType, $data)
|
||||
{
|
||||
$startTime = microtime(true);
|
||||
|
||||
|
@ -14,7 +14,7 @@ if (!function_exists('elixir')) {
|
||||
{
|
||||
static $manifest = null;
|
||||
|
||||
if (is_null($manifest)) {
|
||||
if ($manifest === null) {
|
||||
$manifest = json_decode(file_get_contents(public_path().'/build/rev-manifest.json'), true);
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user