Merge branch 'develop' of github.com:magento/magento2ce into troll_pr (38360b51) · Commits · KIII-12 / Magento

Commit 38360b51 authored 8 years ago by

Roman Ganin

Browse files

Merge branch 'develop' of github.com:magento/magento2ce into troll_pr

parents 9952c02a 3f4fe5e9

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Backend/App/Config.php 31 additions, 22 deletions

app/code/Magento/Backend/App/Config.php
app/code/Magento/Backend/App/ConfigInterface.php 5 additions, 0 deletions

app/code/Magento/Backend/App/ConfigInterface.php
app/code/Magento/Backend/Test/Unit/App/ConfigTest.php 31 additions, 63 deletions

app/code/Magento/Backend/Test/Unit/App/ConfigTest.php
app/code/Magento/Catalog/Model/System/Config/Backend/Catalog/Url/Rewrite/Suffix.php 9 additions, 9 deletions

...odel/System/Config/Backend/Catalog/Url/Rewrite/Suffix.php
app/code/Magento/Catalog/Model/Template/Filter.php 5 additions, 0 deletions

app/code/Magento/Catalog/Model/Template/Filter.php
app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Store/View.php 41 additions, 17 deletions

...to/CatalogUrlRewrite/Model/Category/Plugin/Store/View.php
app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/Plugin/Store/ViewTest.php 11 additions, 0 deletions

...ewrite/Test/Unit/Model/Category/Plugin/Store/ViewTest.php
app/code/Magento/Cms/Test/Unit/Model/Template/FilterTest.php 2 additions, 0 deletions

app/code/Magento/Cms/Test/Unit/Model/Template/FilterTest.php
app/code/Magento/Config/App/Config/Source/ModularConfigSource.php 44 additions, 0 deletions

.../Magento/Config/App/Config/Source/ModularConfigSource.php
app/code/Magento/Config/App/Config/Source/RuntimeConfigSource.php 98 additions, 0 deletions

.../Magento/Config/App/Config/Source/RuntimeConfigSource.php
app/code/Magento/Config/App/Config/Type/System.php 127 additions, 0 deletions

app/code/Magento/Config/App/Config/Type/System.php
app/code/Magento/Config/Block/System/Config/Form.php 90 additions, 21 deletions

app/code/Magento/Config/Block/System/Config/Form.php
app/code/Magento/Config/Block/System/Config/Form/Field.php 4 additions, 1 deletion

app/code/Magento/Config/Block/System/Config/Form/Field.php
app/code/Magento/Config/Model/Config/Backend/Store.php 0 additions, 5 deletions

app/code/Magento/Config/Model/Config/Backend/Store.php
app/code/Magento/Config/Model/Config/Loader.php 5 additions, 0 deletions

app/code/Magento/Config/Model/Config/Loader.php
app/code/Magento/Config/Model/Config/Reader/Source/Deployed/SettingChecker.php 72 additions, 0 deletions

...ig/Model/Config/Reader/Source/Deployed/SettingChecker.php
app/code/Magento/Config/Test/Unit/App/Config/Source/ModularConfigSourceTest.php 43 additions, 0 deletions

...g/Test/Unit/App/Config/Source/ModularConfigSourceTest.php
app/code/Magento/Config/Test/Unit/App/Config/Source/RuntimeConfigSourceTest.php 136 additions, 0 deletions

...g/Test/Unit/App/Config/Source/RuntimeConfigSourceTest.php
app/code/Magento/Config/Test/Unit/App/Config/Type/SystemTest.php 141 additions, 0 deletions

...e/Magento/Config/Test/Unit/App/Config/Type/SystemTest.php
app/code/Magento/Config/Test/Unit/Block/System/Config/Form/FieldTest.php 8 additions, 1 deletion

...o/Config/Test/Unit/Block/System/Config/Form/FieldTest.php

with 903 additions and 139 deletions

Please register or to comment

Admin message

Merge branch 'develop' of github.com:magento/magento2ce into troll_pr