Skip to content

Commit

Permalink
remove assets-auto-compress and fix migrate && merit
Browse files Browse the repository at this point in the history
  • Loading branch information
forecho committed Jul 17, 2016
1 parent 1ffebae commit 1943b24
Show file tree
Hide file tree
Showing 5 changed files with 127 additions and 354 deletions.
8 changes: 0 additions & 8 deletions common/config/main.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
'language' => 'zh-CN',
'modules' => [
],
'bootstrap' => ['assetsAutoCompress'],
'components' => [
'formatter' => [ //for the showing of date datetime
'dateFormat' => 'yyyy-MM-dd',
Expand All @@ -32,13 +31,6 @@
'class' => 'understeam\slack\Client',
'url' => '',
],
'assetsAutoCompress' => [
'class' => '\skeeks\yii2\assetsAuto\AssetsAutoCompressComponent',
'enabled' => true,
'jsCompress' => true,
'cssFileCompile' => true,
'jsFileCompile' => true,
],
'log' => [
'traceLevel' => YII_DEBUG ? 3 : 0,
'targets' => [
Expand Down
3 changes: 1 addition & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,7 @@
"yiier/yii2-merit": "*",
"yiisoft/yii2-httpclient": "dev-master",
"understeam/yii2-slack": "~0.1",
"dmstr/yii2-adminlte-asset": "2.*",
"skeeks/yii2-assets-auto-compress": "*"
"dmstr/yii2-adminlte-asset": "2.*"
},
"require-dev": {
"yiisoft/yii2-codeception": "*",
Expand Down
Loading

0 comments on commit 1943b24

Please sign in to comment.