Skip to content

Commit 6cc9b5c

Browse files
author
Roman Ganin
committed
Merge branch 'develop' of github.corp.ebay.com:magento2/magento2ce into develop
2 parents 6f68420 + a6e17ed commit 6cc9b5c

File tree

360 files changed

+3638
-2241
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

360 files changed

+3638
-2241
lines changed

‎.htaccess

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
############################################
2+
## uncomment the line below to enable developer mode
3+
4+
# SetEnv MAGE_MODE developer
5+
16
############################################
27
## uncomment these lines for CGI mode
38
## make sure to specify the correct cgi php binary file name
@@ -167,6 +172,8 @@
167172
## http://developer.yahoo.com/performance/rules.html#expires
168173

169174
ExpiresDefault "access plus 1 year"
175+
ExpiresByType text/html A0
176+
ExpiresByType text/plain A0
170177

171178
</IfModule>
172179

‎.htaccess.sample

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
############################################
2+
## uncomment the line below to enable developer mode
3+
4+
# SetEnv MAGE_MODE developer
5+
16
############################################
27
## uncomment these lines for CGI mode
38
## make sure to specify the correct cgi php binary file name
@@ -164,6 +169,8 @@
164169
## http://developer.yahoo.com/performance/rules.html#expires
165170

166171
ExpiresDefault "access plus 1 year"
172+
ExpiresByType text/html A0
173+
ExpiresByType text/plain A0
167174

168175
</IfModule>
169176

‎CHANGELOG.md

Lines changed: 212 additions & 41 deletions
Large diffs are not rendered by default.

‎app/code/Magento/AdminNotification/composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-store": "0.42.0-beta11",
7-
"magento/module-backend": "0.42.0-beta11",
8-
"magento/module-media-storage": "0.42.0-beta11",
9-
"magento/framework": "0.42.0-beta11",
6+
"magento/module-store": "0.74.0-beta1",
7+
"magento/module-backend": "0.74.0-beta1",
8+
"magento/module-media-storage": "0.74.0-beta1",
9+
"magento/framework": "0.74.0-beta1",
1010
"lib-libxml": "*",
1111
"magento/magento-composer-installer": "*"
1212
},
1313
"type": "magento2-module",
14-
"version": "0.42.0-beta11",
14+
"version": "0.74.0-beta1",
1515
"license": [
1616
"OSL-3.0",
1717
"AFL-3.0"

‎app/code/Magento/Authorization/composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
"description": "Authorization module provides access to Magento ACL functionality.",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-backend": "0.42.0-beta11",
7-
"magento/framework": "0.42.0-beta11",
6+
"magento/module-backend": "0.74.0-beta1",
7+
"magento/framework": "0.74.0-beta1",
88
"magento/magento-composer-installer": "*"
99
},
1010
"type": "magento2-module",
11-
"version": "0.42.0-beta11",
11+
"version": "0.74.0-beta1",
1212
"license": [
1313
"OSL-3.0",
1414
"AFL-3.0"

‎app/code/Magento/Backend/Test/Unit/App/Action/Plugin/MassactionKeyTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ protected function setUp()
4949
}
5050

5151
/**
52-
* covers \Magento\Backend\App\Action\Plugin\MassactionKey::aroundDispatch
52+
* @covers \Magento\Backend\App\Action\Plugin\MassactionKey::aroundDispatch
5353
*
5454
* @param $postData array|string
5555
* @param array $convertedData
@@ -84,7 +84,7 @@ public function aroundDispatchDataProvider()
8484
}
8585

8686
/**
87-
* covers \Magento\Backend\App\Action\Plugin\MassactionKey::aroundDispatch
87+
* @covers \Magento\Backend\App\Action\Plugin\MassactionKey::aroundDispatch
8888
*/
8989
public function testAroundDispatchWhenMassactionPrepareKeyRequestNotExists()
9090
{

‎app/code/Magento/Backend/Test/Unit/App/Router/NoRouteHandlerTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ protected function setUp()
3737
}
3838

3939
/**
40-
* covers Magento\Backend\App\Router\NoRouteHandler::process
40+
* @covers \Magento\Backend\App\Router\NoRouteHandler::process
4141
*/
4242
public function testProcessWithBackendAreaFrontName()
4343
{
@@ -86,7 +86,7 @@ public function testProcessWithBackendAreaFrontName()
8686
}
8787

8888
/**
89-
* covers Magento\Backend\App\Router\NoRouteHandler::process
89+
* @covers \Magento\Backend\App\Router\NoRouteHandler::process
9090
*/
9191
public function testProcessWithoutAreaFrontName()
9292
{

‎app/code/Magento/Backend/Test/Unit/Block/Page/System/Config/Robots/ResetTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ protected function setUp()
3535
}
3636

3737
/**
38-
* covers \Magento\Backend\Block\Page\System\Config\Robots\Reset::getRobotsDefaultCustomInstructions
38+
* @covers \Magento\Backend\Block\Page\System\Config\Robots\Reset::getRobotsDefaultCustomInstructions
3939
*/
4040
public function testGetRobotsDefaultCustomInstructions()
4141
{

‎app/code/Magento/Backend/Test/Unit/Block/Widget/ButtonTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ protected function tearDown()
5151
}
5252

5353
/**
54-
* covers \Magento\Backend\Block\Widget\Button::getAttributesHtml
54+
* @covers \Magento\Backend\Block\Widget\Button::getAttributesHtml
5555
* @dataProvider getAttributesHtmlDataProvider
5656
*/
5757
public function testGetAttributesHtml($data, $expect)

‎app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Column/Renderer/CurrencyTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ protected function tearDown()
109109
}
110110

111111
/**
112-
* covers \Magento\Backend\Block\Widget\Grid\Column\Renderer\Currency::render
112+
* @covers \Magento\Backend\Block\Widget\Grid\Column\Renderer\Currency::render
113113
*/
114114
public function testRenderWithDefaultCurrency()
115115
{

0 commit comments

Comments
 (0)