Skip to content
This repository was archived by the owner on Apr 29, 2019. It is now read-only.

Commit 6bb8c45

Browse files
irenelagnoirenelagno
committed
Merge branch '2.2-develop' into MAGETWO-80201
2 parents 6394681 + 9db4501 commit 6bb8c45

File tree

184 files changed

+1176
-853
lines changed

Some content is hidden

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

184 files changed

+1176
-853
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"magento/module-store": "100.2.*",
77
"magento/module-backend": "100.2.*",
88
"magento/module-media-storage": "100.2.*",
9-
"magento/framework": "100.2.*",
10-
"magento/module-ui": "100.2.*",
9+
"magento/framework": "101.0.*",
10+
"magento/module-ui": "101.0.*",
1111
"lib-libxml": "*"
1212
},
1313
"type": "magento2-module",

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
"description": "N/A",
44
"require": {
55
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
6-
"magento/module-catalog": "101.1.*",
6+
"magento/module-catalog": "102.0.*",
77
"magento/module-catalog-inventory": "100.2.*",
8-
"magento/module-eav": "100.2.*",
8+
"magento/module-eav": "101.0.*",
99
"magento/module-import-export": "100.2.*",
1010
"magento/module-catalog-import-export": "100.2.*",
11-
"magento/module-customer": "100.2.*",
11+
"magento/module-customer": "101.0.*",
1212
"magento/module-store": "100.2.*",
13-
"magento/framework": "100.2.*"
13+
"magento/framework": "101.0.*"
1414
},
1515
"type": "magento2-module",
1616
"version": "100.2.0-dev",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"require": {
55
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
66
"magento/module-backend": "100.2.*",
7-
"magento/framework": "100.2.*"
7+
"magento/framework": "101.0.*"
88
},
99
"type": "magento2-module",
1010
"version": "100.2.0-dev",

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
"description": "N/A",
44
"require": {
55
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
6-
"magento/module-sales": "100.2.*",
6+
"magento/module-sales": "101.0.*",
77
"magento/module-store": "100.2.*",
8-
"magento/module-quote": "100.2.*",
8+
"magento/module-quote": "101.0.*",
99
"magento/module-checkout": "100.2.*",
1010
"magento/module-backend": "100.2.*",
1111
"magento/module-payment": "100.2.*",
12-
"magento/module-catalog": "101.1.*",
13-
"magento/framework": "100.2.*"
12+
"magento/module-catalog": "102.0.*",
13+
"magento/framework": "101.0.*"
1414
},
1515
"suggest": {
16-
"magento/module-config": "100.2.*"
16+
"magento/module-config": "101.0.*"
1717
},
1818
"type": "magento2-module",
1919
"version": "100.2.0-dev",

‎app/code/Magento/Backend/Controller/Adminhtml/Noroute/Index.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,13 @@
88

99
class Index extends \Magento\Backend\App\Action
1010
{
11+
/**
12+
* Array of actions which can be processed without secret key validation
13+
*
14+
* @var string[]
15+
*/
16+
protected $_publicActions = ['index'];
17+
1118
/**
1219
* @var \Magento\Framework\View\Result\PageFactory
1320
*/

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@
66
"magento/module-store": "100.2.*",
77
"magento/module-directory": "100.2.*",
88
"magento/module-developer": "100.2.*",
9-
"magento/module-eav": "100.2.*",
9+
"magento/module-eav": "101.0.*",
1010
"magento/module-reports": "100.2.*",
11-
"magento/module-sales": "100.2.*",
12-
"magento/module-quote": "100.2.*",
13-
"magento/module-catalog": "101.1.*",
14-
"magento/module-user": "100.2.*",
11+
"magento/module-sales": "101.0.*",
12+
"magento/module-quote": "101.0.*",
13+
"magento/module-catalog": "102.0.*",
14+
"magento/module-user": "101.0.*",
1515
"magento/module-security": "100.2.*",
1616
"magento/module-backup": "100.2.*",
17-
"magento/module-customer": "100.2.*",
17+
"magento/module-customer": "101.0.*",
1818
"magento/module-translation": "100.2.*",
1919
"magento/module-require-js": "100.2.*",
20-
"magento/module-config": "100.2.*",
21-
"magento/framework": "100.2.*"
20+
"magento/module-config": "101.0.*",
21+
"magento/framework": "101.0.*"
2222
},
2323
"suggest": {
2424
"magento/module-theme": "100.2.*"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"magento/module-store": "100.2.*",
77
"magento/module-backend": "100.2.*",
88
"magento/module-cron": "100.2.*",
9-
"magento/framework": "100.2.*"
9+
"magento/framework": "101.0.*"
1010
},
1111
"type": "magento2-module",
1212
"version": "100.2.0-dev",

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@
33
"description": "N/A",
44
"require": {
55
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
6-
"magento/framework": "100.2.*",
6+
"magento/framework": "101.0.*",
77
"magento/magento-composer-installer": "*",
8-
"magento/module-config": "100.2.*",
8+
"magento/module-config": "101.0.*",
99
"magento/module-directory": "100.2.*",
1010
"magento/module-payment": "100.2.*",
1111
"magento/module-checkout": "100.2.*",
12-
"magento/module-sales": "100.2.*",
12+
"magento/module-sales": "101.0.*",
1313
"magento/module-backend": "100.2.*",
14-
"magento/module-vault": "100.2.*",
15-
"magento/module-customer": "100.2.*",
16-
"magento/module-catalog": "101.1.*",
17-
"magento/module-quote": "100.2.*",
14+
"magento/module-vault": "101.0.*",
15+
"magento/module-customer": "101.0.*",
16+
"magento/module-catalog": "102.0.*",
17+
"magento/module-quote": "101.0.*",
1818
"magento/module-paypal": "100.2.*",
19-
"magento/module-ui": "100.2.*",
19+
"magento/module-ui": "101.0.*",
2020
"braintree/braintree_php": "3.22.0"
2121
},
2222
"suggest": {

‎app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@ protected function _getSelectedOptions()
165165
* @param \Magento\Bundle\Model\Option $option
166166
* @param mixed $selectionId
167167
* @return void
168+
* @since 100.2.0
168169
*/
169170
protected function assignSelection(\Magento\Bundle\Model\Option $option, $selectionId)
170171
{

‎app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Multi.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ class Multi extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Optio
2020

2121
/**
2222
* @inheritdoc
23+
* @since 100.2.0
2324
*/
2425
protected function assignSelection(\Magento\Bundle\Model\Option $option, $selectionId)
2526
{

0 commit comments

Comments
 (0)