Merge branch 'develop'

This commit is contained in:
ErickSkrauch 2017-04-15 12:08:18 +03:00
commit c4ca09a922
3 changed files with 7 additions and 7 deletions

View File

@ -8,6 +8,10 @@ class Component extends \mito\sentry\Component {
public $jsNotifier = false; public $jsNotifier = false;
public function init() { public function init() {
if (!$this->enabled) {
return;
}
if (is_array($this->client) && !isset($this->client['release'])) { if (is_array($this->client) && !isset($this->client['release'])) {
$this->client['release'] = Yii::$app->version; $this->client['release'] = Yii::$app->version;
} }

View File

@ -1,6 +1,6 @@
<?php <?php
return [ return [
'version' => '1.1.10', 'version' => '1.1.11',
'vendorPath' => dirname(dirname(__DIR__)) . '/vendor', 'vendorPath' => dirname(dirname(__DIR__)) . '/vendor',
'components' => [ 'components' => [
'cache' => [ 'cache' => [

View File

@ -25,9 +25,9 @@
"ely/yii2-tempmail-validator": "~1.0.0", "ely/yii2-tempmail-validator": "~1.0.0",
"emarref/jwt": "~1.0.3", "emarref/jwt": "~1.0.3",
"ely/amqp-controller": "dev-master#d7f8cdbc66c45e477c9c7d5d509bc0c1b11fd3ec", "ely/amqp-controller": "dev-master#d7f8cdbc66c45e477c9c7d5d509bc0c1b11fd3ec",
"ely/email-renderer": "dev-master#ef1cb3f7a13196524b97ca5aa0a2d5867f2d9207", "ely/email-renderer": "dev-master#d66ec82d2ebae59986ad5e009ae0c951d1cfcccb",
"predis/predis": "^1.0", "predis/predis": "^1.0",
"mito/yii2-sentry": "dev-fix_init#27f00805cb906f73b2c6f8181c1c655decb9be70", "mito/yii2-sentry": "^1.0",
"minime/annotations": "~3.0", "minime/annotations": "~3.0",
"spomky-labs/otphp": "^8.3", "spomky-labs/otphp": "^8.3",
"bacon/bacon-qr-code": "^1.0" "bacon/bacon-qr-code": "^1.0"
@ -61,10 +61,6 @@
{ {
"type": "git", "type": "git",
"url": "git@gitlab.ely.by:elyby/oauth2-server.git" "url": "git@gitlab.ely.by:elyby/oauth2-server.git"
},
{
"type": "git",
"url": "git@github.com:erickskrauch/yii2-sentry.git"
} }
], ],
"scripts": { "scripts": {