Skip to content
This repository was archived by the owner on Nov 19, 2024. It is now read-only.

Commit 62a1eb9

Browse files
authored
Merge branch '2.4.2-develop' into MC38472-remote-storage
2 parents 9fcc820 + 02c3ea9 commit 62a1eb9

File tree

183 files changed

+2776
-146234
lines changed

Some content is hidden

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

183 files changed

+2776
-146234
lines changed

.github/ISSUE_TEMPLATE/NEW_FEATURE.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,3 @@ Issues that do not comply with our Code of Conduct or do not contain enough info
3636
3737
Feel free to remove this section before creating this issue.
3838
-->
39-

.github/workflows/linter.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,6 @@ on:
1919
branches:
2020
- master
2121
- 2.*-develop
22-
paths-ignore:
23-
- '**.md'
24-
- '**.html'
25-
- '**.xml'
2622

2723
###############
2824
# Set the Job #
@@ -54,4 +50,4 @@ jobs:
5450
VALIDATE_ALL_CODEBASE: false
5551
DEFAULT_BRANCH: master
5652
VALIDATE_HTML: false
57-
VALIDATE_MARKDOWN: false
53+
MARKDOWN_CONFIG_FILE: .markdownlint.json

_checks/html_check_hook.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
if url_ignore
3434
url_ignore.push(jekyll_excludes_as_regex).flatten!.uniq!
3535
else
36-
checks_config['html-proofer'].merge!(url_ignore: jekyll_excludes_as_regex)
36+
checks_config['html-proofer'][:url_ignore] = jekyll_excludes_as_regex
3737
end
3838

3939
# Read configuration options for html-proofer

src/_data/mde.yml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ extensions:
310310
name: Product Recommendations
311311
versions:
312312
-
313-
name: 3.10.0
313+
name: 3.2.2
314314
support:
315315
2.3.0: supported
316316
2.3.1: supported
@@ -321,6 +321,18 @@ extensions:
321321
2.3.6: supported
322322
2.4.0: supported
323323
2.4.1: supported
324+
-
325+
name: 3.10.0
326+
support:
327+
2.3.0: compatible
328+
2.3.1: compatible
329+
2.3.2: compatible
330+
2.3.3: compatible
331+
2.3.4: compatible
332+
2.3.5-p1: compatible
333+
2.3.6: compatible
334+
2.4.0: compatible
335+
2.4.1: compatible
324336
-
325337
name: 3.0.8
326338
support:

src/_data/toc/extensions.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,3 +50,10 @@ pages:
5050
- label: Vendor Bundled Extensions (VBEs)
5151
url: /extensions/vendor/
5252
versionless: true
53+
children:
54+
- label: Yotpo
55+
versionless: true
56+
children:
57+
- label: Release Notes
58+
versionless: true
59+
url: /extensions/vendor/yotpo/release-notes.html

src/_data/toc/graphql.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,10 @@ pages:
309309
- label: generateCustomerToken mutation
310310
url: /graphql/mutations/generate-customer-token.html
311311

312+
- label: generateCustomerTokenAsAdmin mutation
313+
url: /graphql/mutations/generate-customer-token-as-admin.html
314+
exclude_versions: ["2.3"]
315+
312316
- label: handlePayflowProResponse mutation
313317
url: /graphql/mutations/handle-payflow-pro-response.html
314318

src/_data/toc/how-do-i.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,3 +55,6 @@ pages:
5555

5656
- label: Customize the list of shipping methods
5757
url: /howdoi/checkout/checkout_shipping_methods.html
58+
59+
- label: Customize Magento Admin design
60+
url: /howdoi/admin/customize_admin.html

src/_data/toc/product-recommendations.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ pages:
2020
url: /recommendations/verify.html
2121
versionless: true
2222

23+
- label: Handle Cookie Restrictions
24+
url: /recommendations/setting-cookie.html
25+
versionless: true
26+
2327
- label: Test Recommendations
2428
url: /recommendations/test.html
2529
versionless: true

src/_data/var.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ mbi: Magento Business Intelligence
2121
# Cloud product name variables
2222

2323
ece: Magento Commerce Cloud
24-
ece-release-date: November 9, 2020
24+
ece-release-date: November 19, 2020
2525
csuite: Magento Commerce Cloud Suite
2626
ct: ece-tools
2727
ct-repo: magento/ece-tools
28-
ct-release: 2002.1.3
28+
ct-release: 2002.1.4
2929
mcp-prod: Magento Cloud Patches
3030
mcp-package: magento/magento-cloud-patches
3131
mcp-release: 1.0.8

0 commit comments

Comments
 (0)