Merge branch 'develop' into MAGETWO-31368
Showing
- .gitignore 1 addition, 0 deletions.gitignore
- app/code/Magento/Config/Controller/Adminhtml/System/Config/Save.php 2 additions, 2 deletions...agento/Config/Controller/Adminhtml/System/Config/Save.php
- app/code/Magento/Config/Test/Unit/Controller/Adminhtml/System/Config/_files/files_array.php 23 additions, 25 deletions...Controller/Adminhtml/System/Config/_files/files_array.php
- app/code/Magento/Developer/Model/Config/Source/WorkflowType.php 45 additions, 0 deletions...de/Magento/Developer/Model/Config/Source/WorkflowType.php
- app/code/Magento/Developer/Model/View/Asset/PreProcessor/DeveloperChain.php 34 additions, 0 deletions...eveloper/Model/View/Asset/PreProcessor/DeveloperChain.php
- app/code/Magento/Developer/Model/View/Asset/PreProcessor/DeveloperChainFactory.php 61 additions, 0 deletions...r/Model/View/Asset/PreProcessor/DeveloperChainFactory.php
- app/code/Magento/Developer/Model/View/Page/Config/ClientSideLessCompilation/Renderer.php 134 additions, 0 deletions...l/View/Page/Config/ClientSideLessCompilation/Renderer.php
- app/code/Magento/Developer/Model/View/Page/Config/RendererFactory.php 70 additions, 0 deletions...ento/Developer/Model/View/Page/Config/RendererFactory.php
- app/code/Magento/Developer/Test/Unit/Model/Config/Source/WorkflowTypeTest.php 45 additions, 0 deletions...eloper/Test/Unit/Model/Config/Source/WorkflowTypeTest.php
- app/code/Magento/Developer/etc/adminhtml/system.xml 20 additions, 0 deletionsapp/code/Magento/Developer/etc/adminhtml/system.xml
- app/code/Magento/Developer/etc/config.xml 3 additions, 0 deletionsapp/code/Magento/Developer/etc/config.xml
- app/code/Magento/Developer/etc/di.xml 14 additions, 0 deletionsapp/code/Magento/Developer/etc/di.xml
- app/etc/di.xml 25 additions, 0 deletionsapp/etc/di.xml
- dev/tests/integration/framework/Magento/TestFramework/App/EnvironmentFactory.php 3 additions, 3 deletions...ramework/Magento/TestFramework/App/EnvironmentFactory.php
- dev/tests/integration/framework/Magento/TestFramework/App/ObjectManager/Environment/Developer.php 2 additions, 2 deletions...TestFramework/App/ObjectManager/Environment/Developer.php
- dev/tests/integration/framework/Magento/TestFramework/ObjectManagerFactory.php 7 additions, 1 deletion.../framework/Magento/TestFramework/ObjectManagerFactory.php
- dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceInterceptor.php.sample 14 additions, 12 deletions.../_expected/SourceClassWithNamespaceInterceptor.php.sample
- dev/tests/integration/testsuite/Magento/Framework/Interception/AbstractPlugin.php 21 additions, 1 deletion...stsuite/Magento/Framework/Interception/AbstractPlugin.php
- dev/tests/integration/testsuite/Magento/Framework/Interception/GeneralTest.php 2 additions, 0 deletions.../testsuite/Magento/Framework/Interception/GeneralTest.php
- dev/tests/integration/testsuite/Magento/Framework/Interception/TwoPluginTest.php 2 additions, 0 deletions...estsuite/Magento/Framework/Interception/TwoPluginTest.php
Please register or sign in to comment