Skip to content

Commit d02ba5d

Browse files
BashevBashev
authored
Merge branch 'magento:develop' into remove-maxlength-url-link
2 parents 73cc481 + db0303f commit d02ba5d

File tree

754 files changed

+9270
-5129
lines changed

Some content is hidden

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

754 files changed

+9270
-5129
lines changed

‎.github/.metadata.json

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
{
2+
"templateVersion": "0.1",
3+
"product": {
4+
"name": "Magento 2 Page Builder",
5+
"description": "Page Builder introduces an intuitive, drag-and-drop interface for creating digital content, powered by content types like images, videos, banners, etc. with instant preview capabilities that enable non-technical users to take control of their content."
6+
},
7+
"contacts": {
8+
"team": {
9+
"name": "Amigos",
10+
"DL": "Grp-amigos",
11+
"slackChannel": "team-amigos"
12+
}
13+
},
14+
"ticketTracker": {
15+
"functionalJiraQueue": {
16+
"projectKey": "PB",
17+
"component": ""
18+
},
19+
"securityJiraQueue": {
20+
"projectKey": "MAGREQ",
21+
"component": "PageBuilder"
22+
}
23+
},
24+
"staticScan": {
25+
"enable": true,
26+
"frequency": "weekly",
27+
"customName": "",
28+
"branchesToScan": []
29+
}
30+
}

‎app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/AwsS3ImageAddImageContentTypeToCMSPageTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<group value="pagebuilder"/>
2020
<group value="pagebuilder-image"/>
2121
<group value="remote_storage_aws_s3"/>
22+
<group value="skip_in_cloud_native_s3"/>
2223
<group value="remote_storage_aws_s3_pagebuilder"/>
2324
</annotations>
2425
<before>

‎app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/AwsS3ImageAddImageIntoPageBuilderStageTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<group value="pagebuilder"/>
2020
<group value="pagebuilder-image"/>
2121
<group value="remote_storage_aws_s3"/>
22+
<group value="skip_in_cloud_native_s3"/>
2223
<group value="remote_storage_aws_s3_pagebuilder"/>
2324
</annotations>
2425
<before>

‎app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/AwsS3ImageInvalidFileTypeValidationTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<group value="pagebuilder"/>
1818
<group value="pagebuilder-image"/>
1919
<group value="remote_storage_aws_s3"/>
20+
<group value="skip_in_cloud_native_s3"/>
2021
<group value="remote_storage_aws_s3_pagebuilder"/>
2122
</annotations>
2223
<before>

‎app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/AwsS3ImageRemoveImageFromStageTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<group value="pagebuilder"/>
2020
<group value="pagebuilder-image"/>
2121
<group value="remote_storage_aws_s3"/>
22+
<group value="skip_in_cloud_native_s3"/>
2223
<group value="remote_storage_aws_s3_pagebuilder"/>
2324
</annotations>
2425
<before>

‎app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/AwsS3PageBuilderCreateTemplateOnCMSBlockForPageAndApplyTemplateToCatalogCategory.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<group value="pagebuilder-cms-block"/>
2222
<group value="pagebuilder-cms-category"/>
2323
<group value="remote_storage_aws_s3"/>
24+
<group value="skip_in_cloud_native_s3"/>
2425
<group value="remote_storage_aws_s3_pagebuilder"/>
2526
</annotations>
2627
<before>

‎app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/AwsS3PageBuilderDeleteTemplate.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<group value="pagebuilder"/>
2020
<group value="pagebuilder-templates"/>
2121
<group value="remote_storage_aws_s3"/>
22+
<group value="skip_in_cloud_native_s3"/>
2223
<group value="remote_storage_aws_s3_pagebuilder"/>
2324
</annotations>
2425
<before>

‎app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/AwsS3PageBuilderVerifySaveContentAsTemplateModalAndApplyTemplateSlideOut.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<group value="pagebuilder"/>
2020
<group value="pagebuilder-templates"/>
2121
<group value="remote_storage_aws_s3"/>
22+
<group value="skip_in_cloud_native_s3"/>
2223
<group value="remote_storage_aws_s3_pagebuilder"/>
2324
</annotations>
2425
<before>

‎app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/AwsS3CanAddVideoToColumnTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
<group value="pagebuilder-column"/>
2121
<group value="pagebuilder-video"/>
2222
<group value="remote_storage_aws_s3"/>
23+
<group value="skip_in_cloud_native_s3"/>
2324
<group value="remote_storage_aws_s3_pagebuilder"/>
2425
</annotations>
2526
<before>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"description": "Aws S3 Page Builder module",
44
"require": {
55
"magento/framework": "*",
6-
"php": "~7.3.0||~7.4.0"
6+
"php": "~7.4.0||~8.1.0"
77
},
88
"suggest": {
99
"magento/module-page-builder": "*",

0 commit comments

Comments
 (0)