Skip to content

Commit 2d4f6c6

Browse files
glo74186glo74186
committed
Merge branch '2.4-develop' of https://github.com/magento-gl/magento2ce into ACQE-9078
2 parents 469abd7 + bda7a1d commit 2d4f6c6

File tree

11,505 files changed

+24558
-23280
lines changed

Some content is hidden

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

11,505 files changed

+24558
-23280
lines changed

‎.php-cs-fixer.dist.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2021 Adobe
4+
* All Rights Reserved.
55
*/
66

77
/**

‎Gruntfile.js.sample‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
2-
* Copyright © Magento, Inc. All rights reserved.
3-
* See COPYING.txt for license details.
2+
* Copyright 2014 Adobe
3+
* All Rights Reserved.
44
*/
55

66
// For performance use one level down: 'name/{,*/}*.js'

‎app/autoload.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
/**
33
* Register basic autoloader that uses include path
44
*
5-
* Copyright © Magento, Inc. All rights reserved.
6-
* See COPYING.txt for license details.
5+
* Copyright 2012 Adobe
6+
* All Rights Reserved.
77
*/
88
declare(strict_types=1);
99

‎app/bootstrap.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66

77
/**

‎app/code/Magento/Catalog/Test/Mftf/Test/StorefrontValidatePriceChangesForConfigurableProductWithMultipleAttributesInWidgetTest.xml‎

Lines changed: 218 additions & 0 deletions
Large diffs are not rendered by default.

‎app/code/Magento/Catalog/Test/Mftf/test-dependency-allowlist‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,6 @@ AdminSetQuantityToEachSkusConfigurableProductActionGroup
4343
SelectStorefrontSideBarAttributeOption
4444
AdminAddProductVideoWithPreviewActionGroup
4545
AdminSetBaseCurrencyActionGroup
46-
AdminSetDefaultCurrencyActionGroup
46+
AdminSetDefaultCurrencyActionGroup
47+
ChangeConfigurableProductChildProductPriceActionGroup
48+
SaveConfigurableProductAddToCurrentAttributeSetActionGroup

‎app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/ValidateTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2015 Adobe
4+
* All Rights Reserved.
55
*/
66
declare(strict_types=1);
77

‎app/code/Magento/CatalogCmsGraphQl/etc/schema.graphqls‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# Copyright © Magento, Inc. All rights reserved.
2-
# See COPYING.txt for license details.
1+
# Copyright 2019 Adobe
2+
# All Rights Reserved.
33

44
interface CategoryInterface {
55
cms_block: CmsBlock @doc(description: "Contains a category CMS block.") @resolver(class: "Magento\\CatalogCmsGraphQl\\Model\\Resolver\\Category\\Block")

‎app/code/Magento/CatalogCustomerGraphQl/etc/schema.graphqls‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# Copyright © Magento, Inc. All rights reserved.
2-
# See COPYING.txt for license details.
1+
# Copyright 2019 Adobe
2+
# All Rights Reserved.
33

44
interface ProductInterface {
55
tier_prices: [ProductTierPrices] @deprecated(reason: "Use `price_tiers` for product tier price information.") @doc(description: "An array of ProductTierPrices objects.") @resolver(class: "Magento\\CatalogCustomerGraphQl\\Model\\Resolver\\TierPrices")

‎app/code/Magento/CatalogUrlRewriteGraphQl/etc/schema.graphqls‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# Copyright © Magento, Inc. All rights reserved.
2-
# See COPYING.txt for license details.
1+
# Copyright 2018 Adobe
2+
# All Rights Reserved.
33

44
interface ProductInterface {
55
url_key: String @doc(description: "The part of the URL that identifies the product")

0 commit comments

Comments
 (0)