Skip to content

Upstream Merge Conflict (2.4-develop) #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Vinai merged 449 commits into from
Dec 5, 2023
Merged

Upstream Merge Conflict (2.4-develop) #67

Changes from all commits
Commits
Show all changes
449 commits
Select commit Hold shift + click to select a range
fd20147
ACP2E-2267: The requested qty is not available message issues
aplapana Nov 3, 2023
a58fe76
Merge branch '2.4-develop' of https://github.com/magento-commerce/mag…
aplapana Nov 3, 2023
ca44b1a
ACPT-1551 Modularity of ReloadProcessor::reloadApplicationState
aa-kashk Nov 3, 2023
c3aa0a5
ACP2E-2267: The requested qty is not available message issues
aplapana Nov 3, 2023
7750077
ACPT-1625
aa-kashk Nov 3, 2023
c32b015
Merge branch '2.4-develop' of https://github.com/magento-l3/magento2c…
Nov 3, 2023
38d01fd
Merge branch '2.4-develop' of https://github.com/magento-l3/magento2c…
devarul Nov 5, 2023
9f57557
ACP2E-2127: Date filter is not working in admin grid.
devarul Nov 5, 2023
269e534
ACP2E-2404: [Magento Cloud] Bug of product custom option validation i…
Nov 6, 2023
a58f4c4
Merge branch '2.4-develop' of https://github.com/magento-l3/magento2c…
Nov 6, 2023
348a66f
ACP2E-2303: Shipping prices do not include tax in the Shipping Method
devarul Nov 6, 2023
c74824e
ACPT-1625
aa-kashk Nov 6, 2023
f3b7c81
ACP2E-2520: Once Cart Become Virtual Cart after removing physical pro…
veloraven Nov 6, 2023
c5628dd
Merge branch '2.4-develop' into ACP2E-2520
veloraven Nov 6, 2023
de8fe82
ACPT-1625
aa-kashk Nov 6, 2023
548789b
ACP2E-2595: Custom Customer Attribute Not Saving File type Attribute(…
o-iegorov Nov 6, 2023
2b0c8fe
ACP2E-2595: Custom Customer Attribute Not Saving File type Attribute(…
o-iegorov Nov 6, 2023
dcf0e0b
Merge pull request #565 from magento-performance/ACPT-1589
andimov Nov 7, 2023
1f0b3e0
Merge remote-tracking branch 'origin/AC-9313' into spartans_pr_07112023
glo60612 Nov 7, 2023
32189da
Merge remote-tracking branch 'origin/AC-9027' into spartans_pr_07112023
glo60612 Nov 7, 2023
cde4ea3
Merge remote-tracking branch 'origin/AC-8998' into spartans_pr_07112023
glo60612 Nov 7, 2023
57c0c33
Merge remote-tracking branch 'origin/AC-8795' into spartans_pr_07112023
glo60612 Nov 7, 2023
a795230
Merge remote-tracking branch 'origin/AC-7099-v4' into spartans_pr_071…
glo60612 Nov 7, 2023
8bb0c22
Merge remote-tracking branch 'origin/AC-1477' into spartans_pr_07112023
glo60612 Nov 7, 2023
5e0d192
Merge remote-tracking branch 'origin/2.4-develop' into spartans_pr_07…
glo60612 Nov 7, 2023
e03bc48
Merge branch '2.4-develop' of https://github.com/magento-l3/magento2c…
devarul Nov 7, 2023
55da81c
ACP2E-2127: Date filter is not working in admin grid.
devarul Nov 7, 2023
3b2af91
Merge branch '2.4-develop' of https://github.com/magento-l3/magento2c…
devarul Nov 7, 2023
cc4e0b1
ACP2E-2303: Shipping prices do not include tax in the Shipping Method
devarul Nov 7, 2023
67f1b8f
AC-2917::Migration from extjs library for pages catalog/category/tree…
Atul-glo35265 Sep 29, 2023
4fb74ce
AC-2917 conflict resolve
Atul-glo35265 Nov 7, 2023
d9cdefc
Merge branch 'magento-commerce:2.4-develop' into extjs-jira-ac-9320
nishant04412 Nov 7, 2023
1f99ad8
ACP2E-2267: The requested qty is not available message issues
aplapana Nov 7, 2023
ac4f101
Merge branch '2.4-develop' of https://github.com/magento-l3/magento2c…
aplapana Nov 7, 2023
8e0a404
ACP2E-2267: The requested qty is not available message issues
aplapana Nov 7, 2023
92ee679
ACP2E-2595: Custom Customer Attribute Not Saving File type Attribute(…
o-iegorov Nov 7, 2023
2bb12c4
Merge branch 'application-server' of github.com:magento-performance/m…
JacobBrownAustin Nov 7, 2023
19738a7
ACP2E-2495: Promocode is not getting released for payment failed with…
dhorytskyi Nov 4, 2023
2118964
ACP2E-2267: The requested qty is not available message issues
aplapana Nov 8, 2023
fe17ac2
AC-9713:Upgrade Less Library(fix issue for grunt less:luma)
glo17680 Nov 8, 2023
369aff2
ACP2E-2127: Date filter is not working in admin grid.
devarul Nov 8, 2023
4cd3fbf
ACPT-1669: GraphQl\Config & Search\Request\Config need to be cleaned …
JacobBrownAustin Nov 4, 2023
67d0a93
Merge branch 'ACPT-1634' into ACPT-1660-and-ACPT-1634
JacobBrownAustin Nov 8, 2023
fe5fae9
ACPT-1669: GraphQl\Config & Search\Request\Config need to be cleaned …
JacobBrownAustin Nov 4, 2023
3888862
ACP2E-2267: The requested qty is not available message issues
aplapana Nov 8, 2023
2100cc7
ACP2E-2520: Once Cart Become Virtual Cart after removing physical pro…
veloraven Nov 8, 2023
7a90710
Merge branch '2.4-develop' of https://github.com/magento-commerce/mag…
dhorytskyi Nov 8, 2023
5441ed6
ACP2E-2495: Promocode is not getting released for payment failed with…
dhorytskyi Nov 8, 2023
f36f0fd
ACP2E-2520: Once Cart Become Virtual Cart after removing physical pro…
veloraven Nov 8, 2023
569fdf2
Merge branch '2.4-develop' into ACP2E-2520
veloraven Nov 8, 2023
5e501ba
ACP2E-2520: Once Cart Become Virtual Cart after removing physical pro…
veloraven Nov 8, 2023
ee2f6b4
ACPT-1679: Skip failing WebApi GraphQL tests
JacobBrownAustin Nov 8, 2023
3088085
ACP2E-2568: Image file is Case insensitive in Pagebuilder(Image not s…
thiaramus Nov 8, 2023
71e6a30
ACP2E-2595: Custom Customer Attribute Not Saving File type Attribute(…
o-iegorov Nov 8, 2023
2bd3e58
ACP2E-2595: Custom Customer Attribute Not Saving File type Attribute(…
o-iegorov Nov 8, 2023
31c9a56
Merge branch 'magento-commerce:2.4-develop' into ACP2E-2595
o-iegorov Nov 9, 2023
c352f29
AC-9713:Upgrade Less Library(fix static test failures)
glo17680 Nov 9, 2023
cec737f
AC-9653::UPS SOAP and REST support in 2.4.7-beta3-code review fixes o…
glo05363 Nov 9, 2023
8e7cae2
Merge branch '2.4-develop' of https://github.com/magento-l3/magento2c…
devarul Nov 9, 2023
29389d0
ACP2E-2127: Date filter is not working in admin grid.
devarul Nov 9, 2023
fcbf36a
ACP2E-2127: Date filter is not working in admin grid.
devarul Nov 9, 2023
cbb44f9
ACP2E-2127: Date filter is not working in admin grid.
devarul Nov 9, 2023
90cc520
ACP2E-2127: Date filter is not working in admin grid.
devarul Nov 9, 2023
73a3ce5
Merge branch '2.4-develop' into UPS_AC9653_OCT_22_2023
glo05363 Nov 9, 2023
22f1039
Merge remote-tracking branch 'gl_magento2ce/AC-9653' into UPS_AC9653_…
glo05363 Nov 9, 2023
28ff7b6
Migration from extjs to jstree minor corrections
nishant04412 Nov 9, 2023
f3babf0
Merge branch 'magento-commerce:2.4-develop' into application-server
andimov Nov 9, 2023
b37aa1b
ACP2E-2520: Once Cart Become Virtual Cart after removing physical pro…
veloraven Nov 9, 2023
13c1af0
Merge branch '2.4-develop' into ACP2E-2520
veloraven Nov 9, 2023
672e7b2
Merge branch 'magento-commerce:2.4-develop' into application-server
andimov Nov 9, 2023
087de6b
Merge remote-tracking branch 'perf-ce/application-server' into ACPT-1551
aa-kashk Nov 9, 2023
dd1da05
ACP2E-2595: Custom Customer Attribute Not Saving File type Attribute(…
o-iegorov Nov 9, 2023
5dcb5c1
Merge branch 'magento-commerce:2.4-develop' into ACP2E-2595
o-iegorov Nov 9, 2023
d2a69d4
ACPT-1551: Modularity of ReloadProcessor::reloadApplicationState
aa-kashk Nov 9, 2023
dafd5fa
ACP2E-2568: Image file is Case insensitive in Pagebuilder(Image not s…
thiaramus Nov 9, 2023
1952326
Merge branch '2.4-develop' of https://github.com/magento-commerce/mag…
thiaramus Nov 9, 2023
f0267fc
ACP2E-2568: Image file is Case insensitive in Pagebuilder(Image not s…
thiaramus Nov 9, 2023
fd075fd
ACP2E-2568: Image file is Case insensitive in Pagebuilder(Image not s…
thiaramus Nov 9, 2023
f25ff07
ACP2E-2568: Image file is Case insensitive in Pagebuilder(Image not s…
thiaramus Nov 9, 2023
599e242
ACP2E-2568: Image file is Case insensitive in Pagebuilder(Image not s…
thiaramus Nov 9, 2023
0d63775
ACPT-1660: Fix WebApi GraphQL tests on Application Server
JacobBrownAustin Nov 10, 2023
d5ae702
ACPT-1669
JacobBrownAustin Nov 10, 2023
43ad3bf
ACPT-1551: Modularity of ReloadProcessor::reloadApplicationState
aa-kashk Nov 10, 2023
86db0d8
AC-9653::UPS SOAP and REST support in 2.4.7-beta3-SVC Approval fixes …
glo05363 Nov 10, 2023
0264d9e
Merge branch '2.4-develop' of https://github.com/magento-l3/magento2c…
devarul Nov 10, 2023
0ce144d
Merge branch '2.4-develop' into UPS_AC9653_OCT_22_2023
glo05363 Nov 10, 2023
e7df0c2
Merge remote-tracking branch 'gl_magento2ce/AC-9653' into UPS_AC9653_…
glo05363 Nov 10, 2023
894dccf
ACP2E-2127: Date filter is not working in admin grid.
devarul Nov 10, 2023
adedbc7
Merge branch '2.4-develop' into ACPT-1669
JacobBrownAustin Nov 10, 2023
e5d7579
Merge branch '2.4-develop' of github.com:magento-commerce/magento2ce …
JacobBrownAustin Nov 10, 2023
95cdf3c
Merge pull request #573 from magento-performance/ACPT-1679-and-ACPT-1…
andimov Nov 10, 2023
22cd0cf
Merge remote-tracking branch 'perf-ce/application-server' into ACPT-1551
aa-kashk Nov 10, 2023
b65f8a4
ACPT-1660: Fix WebApi GraphQL tests on Application Server
JacobBrownAustin Nov 10, 2023
a6baf81
Merge branch 'application-server' of github.com:magento-performance/m…
JacobBrownAustin Nov 10, 2023
decf9fa
Revert "ACPT-1679: Skip failing WebApi GraphQL tests"
JacobBrownAustin Nov 10, 2023
ea03f79
ACPT-1551: Modularity of ReloadProcessor::reloadApplicationState
aa-kashk Nov 10, 2023
1c90e29
ACPT-1660: Fix WebApi GraphQL tests on Application Server
JacobBrownAustin Nov 10, 2023
0175ea7
Merge branch '2.4-develop' of https://github.com/magento-l3/magento2c…
aplapana Nov 13, 2023
7e8f46a
Merge branch 'magento-commerce:2.4-develop' into application-server
andimov Nov 13, 2023
06a797a
Merge branch '2.4-develop' into ds_fix-docs
magento-devops-queue-mgr-svc Nov 13, 2023
43f16c9
ACPT-1660: Fix WebApi GraphQL tests on Application Server
JacobBrownAustin Nov 13, 2023
01dc90e
Merge branch '2.4-develop' of github.com:magento-commerce/magento2ce …
JacobBrownAustin Nov 13, 2023
04add01
Merge remote-tracking branch 'magento-l3/ACP2E-2357' into 2.4-develop
Nov 14, 2023
4cde0ce
Merge remote-tracking branch 'magento-l3/ACP2E-2303' into 2.4-develop
Nov 14, 2023
364d994
Merge remote-tracking branch 'magento-l3/ACP2E-2404' into 2.4-develop
Nov 14, 2023
3adc18f
Merge remote-tracking branch 'magento-l3/ACP2E-2481' into 2.4-develop
Nov 14, 2023
0e33f6f
Merge remote-tracking branch 'magento-l3/ACP2E-2511' into 2.4-develop
Nov 14, 2023
064c834
Merge branch '2.4-develop' of https://github.com/magento-l3/magento2c…
aplapana Nov 14, 2023
5147420
Merge branch '2.4-develop' of https://github.com/magento-l3/magento2c…
devarul Nov 14, 2023
55f401c
ACP2E-2127: Date filter is not working in admin grid.
devarul Nov 14, 2023
36d6566
Fix ShowTest
dshevtsov Nov 14, 2023
396ef20
ACPT-1687: Move State Comparator/Collector into proper place
JacobBrownAustin Nov 14, 2023
80cd957
ACP2E-2412: Custom Address Attribute not rendering as per sort order
arnobsh Nov 13, 2023
6ce291b
ACP2E-2127: Date filter is not working in admin grid.
devarul Nov 15, 2023
03b2996
ACPT-1665:Fix searchConfig merge in SearchCriteriaBuilder
aa-kashk Nov 15, 2023
82343cb
ACP2E-2127: Date filter is not working in admin grid.
devarul Nov 15, 2023
57138e7
Merge pull request #574 from magento-performance/ACPT-1660-and-ACPT-1634
andimov Nov 15, 2023
c179f4d
Merge branch 'application-server' of github.com:magento-performance/m…
JacobBrownAustin Nov 15, 2023
ee8ac1e
Merge pull request #575 from magento-performance/ACPT-1687
andimov Nov 15, 2023
1a58d72
ACPT-1665:Fix searchConfig merge in SearchCriteriaBuilder
aa-kashk Nov 15, 2023
62a9208
ACPT-1551: Modularity of ReloadProcessor::reloadApplicationState
aa-kashk Nov 15, 2023
f327620
Merge pull request #562 from magento-performance/ACPT-1551
andimov Nov 15, 2023
0630664
Use @codingStandardsIgnoreLine for long URLs
dshevtsov Nov 15, 2023
cfe41e5
Merge branch '2.4-develop' into ds_fix-docs
dshevtsov Nov 16, 2023
777c86d
Fix types
dshevtsov Nov 16, 2023
1b8597a
Merge branch '2.4-develop' of https://github.com/magento-commerce/mag…
Nov 16, 2023
735b0b4
ACP2E-2459: Exception during multiple address checkout when admin use…
arnobsh Nov 15, 2023
4fa8f6d
Merge branch '2.4-develop' into UPS_AC9653_OCT_22_2023
magento-devops-queue-mgr-svc Nov 16, 2023
68fd4b5
Merge branch 'magento-commerce:2.4-develop' into application-server
andimov Nov 16, 2023
79bb853
ACPT-1551: Modularity of ReloadProcessor::reloadApplicationState
aa-kashk Nov 17, 2023
2feb4ea
Merge pull request #577 from magento-performance/ACPT-1551-2
andimov Nov 17, 2023
2cc0a1f
Merge pull request #576 from magento-performance/ACPT-1665
andimov Nov 17, 2023
6abbd3f
Merge branch 'ACPT-1669' into application-server
JacobBrownAustin Nov 17, 2023
10b1920
Merge branch 'application-server' of github.com:magento-performance/m…
JacobBrownAustin Nov 17, 2023
5365518
Merge branch '2.4-develop' into ACPT-1669
andimov Nov 17, 2023
d9d6dfd
ACPT-1688: Fix Static Tests failures on Application-Server branch
yaroslavGoncharuk Nov 18, 2023
edd599b
Merge pull request #8593 from commerce-docs/ds_fix-docs
okolesnyk Nov 19, 2023
0b66a45
Merge branch '2.4-develop' into UPS_AC9653_OCT_22_2023
magento-devops-queue-mgr-svc Nov 19, 2023
f838c9e
Merge branch '2.4-develop' of https://github.com/magento-commerce/mag…
Nov 20, 2023
b25f3b2
Merge branch '2.4-develop' into ACPT-1669
andimov Nov 20, 2023
5c69f9b
Merge branch '2.4-develop' into application-server
andimov Nov 20, 2023
b8d8c7a
Merge branch 'ACP2E-2503' of https://github.com/magento-l3/magento2ce…
thiaramus Nov 20, 2023
73b1515
Merge branch 'ACP2E-2308' of https://github.com/magento-l3/magento2ce…
thiaramus Nov 20, 2023
b4d2d0e
Merge branch 'ACP2E-2296' of https://github.com/magento-l3/magento2ce…
thiaramus Nov 20, 2023
6235bb4
Merge branch 'ACP2E-2266' of https://github.com/magento-l3/magento2ce…
thiaramus Nov 20, 2023
81e372b
Merge branch 'ACP2E-2260' of https://github.com/magento-l3/magento2ce…
thiaramus Nov 20, 2023
36e6e6f
Merge branch 'ACP2E-2252' of https://github.com/magento-l3/magento2ce…
thiaramus Nov 20, 2023
3bfbf3b
Merge branch 'ACP2E-2166' of https://github.com/magento-l3/magento2ce…
thiaramus Nov 20, 2023
2f58bf9
Merge branch 'ACP2E-2069' of https://github.com/magento-l3/magento2ce…
thiaramus Nov 20, 2023
3b1a80e
ACPT-1688: Fix Static Tests failures on Application-Server branch 2
yaroslavGoncharuk Nov 20, 2023
60865b6
ACPT-1689: Fix Integration Tests failures on Application-Server branch
andimov Nov 21, 2023
e85da89
ACPT-1696: Fix SVC test failures on Application-Server branch
andimov Nov 21, 2023
97e33f5
Merge pull request #8611 from magento-l3/Tier4-PR-10-30-2023
dhorytskyi Nov 21, 2023
7b5b588
Merge branch '2.4-develop' into application-server
andimov Nov 21, 2023
300eb43
Merge branch 'application-server' into ACPT-1688
yaroslavGoncharuk Nov 21, 2023
f60294e
ACPT-1688: Fix Static Tests failures on Application-Server branch;
aa-kashk Nov 21, 2023
38102ee
Merge branch '2.4-develop' into ACPT-1669
andimov Nov 21, 2023
dfb74c2
ACPT-1688: Fix Static Tests failures on Application-Server branch
andimov Nov 22, 2023
13f645b
Merge branch '2.4-develop' of https://github.com/magento-commerce/mag…
Nov 22, 2023
c0f3904
ACPT-1688: Fix Static Tests failures on Application-Server branch
andimov Nov 22, 2023
da3d4f4
Merge branch 'magento-commerce:2.4-develop' into ACP2E-2357
lakshmana49 Nov 22, 2023
57365d2
ACPT-1688: Fix Static Tests failures on Application-Server branch Final
yaroslavGoncharuk Nov 22, 2023
4882f16
Merge branch '2.4-develop' into spartans_pr_07112023
magento-devops-queue-mgr-svc Nov 22, 2023
cca96b9
Merge branch '2.4-develop' into Arrows_platform_health_Extjs
magento-devops-queue-mgr-svc Nov 23, 2023
298cbd4
Merge pull request #8625 from magento-gl/Arrows_platform_health_Extjs
internal-magento-queue-manager[bot] Nov 23, 2023
f111c28
Merge branch '2.4-develop' into application-server
magento-devops-queue-mgr-svc Nov 23, 2023
26126f1
Merge remote-tracking branch 'origin/2.4-develop' into spartans_pr_07…
glo60612 Nov 24, 2023
463065c
Merge remote-tracking branch 'origin/spartans_pr_07112023' into spart…
glo60612 Nov 24, 2023
266fa1b
Merge branch '2.4-develop' into ACPT-1669
aa-kashk Nov 27, 2023
b4e74c8
ACPT-1688: Fix Static Tests failures
andimov Nov 27, 2023
a41a139
Merge pull request #578 from magento-performance/ACPT-1688
andimov Nov 27, 2023
aca3ba4
Merge remote-tracking branch 'l3/ACP2E-2267' into Tier4-PR-Delivery-1…
veloraven Nov 27, 2023
07d7db9
Merge remote-tracking branch 'l3/ACP2E-2345' into Tier4-PR-Delivery-1…
veloraven Nov 27, 2023
892abe1
Merge remote-tracking branch 'l3/ACP2E-2522-V2' into Tier4-PR-Deliver…
veloraven Nov 27, 2023
19e04f7
Merge remote-tracking branch 'l3/ACP2E-2412' into Tier4-PR-Delivery-1…
veloraven Nov 27, 2023
3f9bb54
Merge remote-tracking branch 'l3/ACP2E-2457' into Tier4-PR-Delivery-1…
veloraven Nov 27, 2023
9a56605
Merge remote-tracking branch 'l3/ACP2E-2459' into Tier4-PR-Delivery-1…
veloraven Nov 27, 2023
1046d9b
Merge remote-tracking branch 'l3/ACP2E-2464' into Tier4-PR-Delivery-1…
veloraven Nov 27, 2023
82e837f
Merge remote-tracking branch 'l3/ACP2E-2469' into Tier4-PR-Delivery-1…
veloraven Nov 27, 2023
d7690e8
Merge remote-tracking branch 'l3/ACP2E-2495' into Tier4-PR-Delivery-1…
veloraven Nov 27, 2023
9f431a7
Merge remote-tracking branch 'l3/ACP2E-2520' into Tier4-PR-Delivery-1…
veloraven Nov 27, 2023
c6f24d4
Merge remote-tracking branch 'l3/ACP2E-2568' into Tier4-PR-Delivery-1…
veloraven Nov 27, 2023
f83266d
Merge remote-tracking branch 'l3/ACP2E-2595' into Tier4-PR-Delivery-1…
veloraven Nov 27, 2023
748ab2f
Merge branch '2.4-develop' of https://github.com/magento-l3/magento2c…
Nov 27, 2023
0d9cc7e
Merge branch '2.4-develop' of https://github.com/magento-l3/magento2c…
Nov 27, 2023
1993bce
ACPT-1697: Move state-*-list.php files back to dev from lib
JacobBrownAustin Nov 27, 2023
265ae89
ACPT-1697: Move state-*-list.php files back to dev from lib
JacobBrownAustin Nov 27, 2023
6d872de
ACPT-1688: Fix Static Tests failures on Application-Server branch
yaroslavGoncharuk Nov 27, 2023
f0656a5
Merge branch '2.4-develop' of https://github.com/magento-l3/magento2c…
devarul Nov 28, 2023
f5037fc
Merge branch '2.4-develop' of https://github.com/magento-l3/magento2c…
devarul Nov 28, 2023
921f4c5
Merge branch '2.4-develop' into UPS_AC9653_OCT_22_2023
glo05363 Nov 28, 2023
51fb3ae
Merge branch 'magento-commerce:2.4-develop' into ACP2E-2357
lakshmana49 Nov 28, 2023
fbd7676
LYNX-289: Add property caching for customer_group_excluded_website
bl4de Nov 28, 2023
9e05bc6
Merge remote-tracking branch 'origin/AC-9665' into Hammer_PlatformHea…
glo71317 Nov 28, 2023
efe5560
Merge pull request #8599 from magento-gl/UPS_AC9653_OCT_22_2023
sidolov Nov 28, 2023
5384483
Merge branch '2.4-develop' into ACPT-1669
magento-devops-queue-mgr-svc Nov 28, 2023
553e761
Merge branch '2.4-develop' into spartans_pr_07112023
magento-devops-queue-mgr-svc Nov 28, 2023
538a07f
Merge branch 'magento-commerce:2.4-develop' into application-server
andimov Nov 28, 2023
b6791bb
Merge pull request #580 from magento-performance/ACPT-1697
andimov Nov 28, 2023
b5f4d4e
Merge branch '2.4-develop' into Tier4-PR-Delivery-11-18-23
veloraven Nov 28, 2023
29bbc3a
Merge branch 'magento-commerce:2.4-develop' into ACP2E-2357
lakshmana49 Nov 28, 2023
484c2a8
Merge branch 'application-server' into ACPT-1688_2
yaroslavGoncharuk Nov 28, 2023
e901757
ACPT-1688: Fix Static Tests failures on Application-Server branch 2
yaroslavGoncharuk Nov 28, 2023
ff5e460
Merge branch '2.4-develop' into MCLOUD-10884-Q4-API-performance-optim…
bl4de Nov 28, 2023
ca55052
ACPT-1688: Fix Static Tests failures on Application-Server branch 3
yaroslavGoncharuk Nov 28, 2023
921bca9
ACPT-1688: Fix Static Tests failures on Application-Server branch 4
yaroslavGoncharuk Nov 28, 2023
5d5edd1
GraphQlCheckoutMutationsStateTest & GraphQlCustomerMutationsTest: ski…
JacobBrownAustin Nov 28, 2023
dca3621
ACPT-1688: Fix Static Tests failures on Application-Server branch 5
yaroslavGoncharuk Nov 28, 2023
2807445
Merge pull request #8620 from magento-performance/ACPT-1669
andimov Nov 28, 2023
d0aee58
Merge branch '2.4-develop' into spartans_pr_07112023
magento-devops-queue-mgr-svc Nov 28, 2023
83a151e
Merge branch '2.4-develop' into Tier4-PR-Delivery-11-18-23
veloraven Nov 28, 2023
3cf454d
Merge remote-tracking branch 'origin/2.4-develop' into application-se…
andimov Nov 29, 2023
ee0548e
Merge pull request #581 from magento-performance/ACPT-1688_2
andimov Nov 29, 2023
1674596
ACPT-1688: Fix Metric Types
andimov Nov 29, 2023
601dec4
Merge pull request #8623 from magento-gl/spartans_pr_07112023
internal-magento-queue-manager[bot] Nov 29, 2023
c19167f
Merge branch '2.4-develop' into application-server
magento-devops-queue-mgr-svc Nov 29, 2023
c922e63
Merge branch '2.4-develop' into Tier4-PR-Delivery-11-18-23
magento-devops-queue-mgr-svc Nov 29, 2023
6ee4669
Merge branch '2.4-develop' of https://github.com/magento-commerce/mag…
Nov 29, 2023
01fd80b
Merge branch '2.4-develop' into MCLOUD-10884-Q4-API-performance-optim…
sivaschenko Nov 29, 2023
46e1e8d
Merge branch '2.4-develop' of https://github.com/magento-l3/magento2c…
Nov 29, 2023
28d6a16
Merge branch '2.4-develop' of https://github.com/magento-l3/magento2c…
Nov 29, 2023
c0d0f76
LYNX-290: Bulk quote_shipping_rate delete (#174)
sivaschenko Nov 29, 2023
f8474ca
Merge pull request #8640 from magento-l3/Tier4-PR-Delivery-11-18-23
dhorytskyi Nov 29, 2023
5100c9b
Merge branch '2.4-develop' into application-server
magento-devops-queue-mgr-svc Nov 29, 2023
8f73193
Merge branch '2.4-develop' of https://github.com/magento-l3/magento2c…
Nov 30, 2023
771b165
Merge branch '2.4-develop' of https://github.com/magento-l3/magento2c…
Nov 30, 2023
de0507f
Merge branch '2.4-develop' of https://github.com/magento-commerce/mag…
Nov 30, 2023
94eada5
Merge branch '2.4-develop' of https://github.com/magento-l3/magento2c…
devarul Nov 30, 2023
f14414a
Merge branch '2.4-develop' of https://github.com/magento-l3/magento2c…
devarul Nov 30, 2023
5aed474
Merge branch '2.4-develop' into MCLOUD-10884-Q4-API-performance-optim…
magento-devops-queue-mgr-svc Nov 30, 2023
0afe466
Merge branch '2.4-develop' of https://github.com/magento-l3/magento2c…
Nov 30, 2023
faefcde
Merge remote-tracking branch 'magento-l3/ACP2E-2127' into Tier4-Kings…
Nov 30, 2023
1efd720
Merge remote-tracking branch 'magento-l3/ACP2E-2303' into Tier4-Kings…
Nov 30, 2023
d57e5df
Merge remote-tracking branch 'magento-l3/ACP2E-2357' into Tier4-Kings…
Nov 30, 2023
408d183
Merge remote-tracking branch 'magento-l3/ACP2E-2404' into Tier4-Kings…
Nov 30, 2023
90b2571
Merge remote-tracking branch 'magento-l3/ACP2E-2511' into Tier4-Kings…
Nov 30, 2023
e90caea
Merge remote-tracking branch 'magento-l3/ACP2E-2481' into Tier4-Kings…
Nov 30, 2023
fb7f166
Merge branch '2.4-develop' into Hammer_PlatformHealth_247Beta3
magento-devops-queue-mgr-svc Dec 1, 2023
50c513f
Merge pull request #8648 from magento-lynx/MCLOUD-10884-Q4-API-perfor…
svera Dec 1, 2023
7f2b597
Merge branch '2.4-develop' into Tier4-Kings-PR-11-08-2023
magento-devops-queue-mgr-svc Dec 1, 2023
81112a9
Merge branch '2.4-develop' into Hammer_PlatformHealth_247Beta3
magento-devops-queue-mgr-svc Dec 1, 2023
7d724b7
Merge pull request #8626 from magento-l3/Tier4-Kings-PR-11-08-2023
dhorytskyi Dec 1, 2023
1633f2a
Merge branch '2.4-develop' into Hammer_PlatformHealth_247Beta3
magento-devops-queue-mgr-svc Dec 1, 2023
982a732
Merge remote-tracking branch 'origin/2.4-develop' into application-se…
aa-kashk Dec 2, 2023
ec0c9d6
ACPT-1226: GraphQlStateTest improvements and other fixes;
aa-kashk Dec 2, 2023
8f142e5
ACPT-1689: Fix Integration Tests failures
andimov Dec 3, 2023
dfba86f
Merge pull request #8629 from magento-performance/application-server
andimov Dec 4, 2023
d11dc91
Merge branch '2.4-develop' into Hammer_PlatformHealth_247Beta3
magento-devops-queue-mgr-svc Dec 4, 2023
d88a9d2
Merge pull request #8649 from magento-gl/Hammer_PlatformHealth_247Beta3
internal-magento-queue-manager[bot] Dec 4, 2023
0f841cf
Merge branch '2.4-develop' into 2.4-develop-upstream
mage-os-ci Dec 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Contributions to the Mage-OS Magento 2 codebase are done using the fork & pull model.
This contribution model has contributors maintaining their own fork of the Mage-OS Magento 2 repository.
The forked repository is then used to submit a request to the base repository to “pull” a set of changes.
The forked repository is then used to submit a request to the base repository to "pull" a set of changes.
For more information on pull requests please refer to [GitHub Help](https://help.github.com/articles/about-pull-requests/).

Contributions can take the form of new components or features, changes to existing features, tests, documentation (such as developer guides, user guides, examples, or specifications), bug fixes or optimizations.
Expand Down