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

Commit abb7604

Browse files
committed
Merge branch '2.4.1-develop' into 2.4.2-develop
2 parents 0ad0bf3 + c09d6d6 commit abb7604

File tree

14 files changed

+1536
-298
lines changed

14 files changed

+1536
-298
lines changed

src/_data/var.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ ct-repo: magento/ece-tools
2828
ct-release: 2002.1.2
2929
mcp-prod: Magento Cloud Patches
3030
mcp-package: magento/magento-cloud-patches
31-
mcp-release: 1.0.6
31+
mcp-release: 1.0.7
3232
mcd-package: magento/magento-cloud-docker
3333
mcd-prod: Magento Cloud Docker
3434
mcd-release: 1.1.2

src/_data/whats-new.yml

Lines changed: 157 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,164 @@ description: This page contains recent changes that we think you'd like to know
44
We exclude from this list proofreading, spelling checks, and all minor updates.
55
link: "/whats-new.html"
66
thread: "/whatsnew-feed.xml"
7-
updated: Thu Oct 8 18:38:18 2020
7+
updated: Wed Oct 14 19:58:40 2020
88
entries:
9+
- description: Added release notes to describe the Magento 2.3.6 and Magento 2.4.1
10+
release notes. See [2.4 Release Information](https://devdocs.magento.com/guides/v2.4/release-notes/bk-release-notes.html)
11+
and [2.3 Release Information](https://devdocs.magento.com/guides/v2.3/release-notes/bk-release-notes.html).
12+
versions: 2.3.6, 2.4.1
13+
type: Major Update
14+
date: October 15, 2020
15+
link: https://github.com/magento/devdocs/pull/8036
16+
contributor: jfrontain
17+
profile: https://github.com/jfrontain
18+
- description: Fixed invalid `env.php` code sample for [message queue configuration](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/message-queues/message-queues.html).
19+
versions: 2.3.6
20+
type: Technical
21+
date: October 15, 2020
22+
link: https://github.com/magento/devdocs/pull/7896
23+
contributor: jeff-matthews
24+
profile: https://github.com/jeff-matthews
25+
- description: Added a new overview page for [Klarna's payment method](https://devdocs.magento.com/guides/v2.4/graphql/payment-methods/klarna.html)
26+
and a new reference page for Klarna's [`createKlarnaPaymentsSession`](https://devdocs.magento.com/guides/v2.4/graphql/mutations/create-klarna-payments-session.html)
27+
GraphQL mutation.
28+
versions: 2.4.1
29+
type: New Topic
30+
date: October 15, 2020
31+
link: https://github.com/magento/devdocs/pull/7891
32+
contributor: jeff-matthews
33+
profile: https://github.com/jeff-matthews
34+
- description: Added release notes for [Inventory Management](https://devdocs.magento.com/guides/v2.3/inventory/release-notes.html).
35+
versions: 2.4.1
36+
type: Major Update
37+
date: October 15, 2020
38+
link: https://github.com/magento/devdocs/pull/7925
39+
contributor: sidolov
40+
profile: https://github.com/sidolov
41+
- description: Added a list of [REST endpoints](https://devdocs.magento.com/guides/v2.4/rest/protected-endpoints.html)
42+
and a list of [GraphQL mutations](https://devdocs.magento.com/guides/v2.4/graphql/protected-mutations.html)
43+
that require an `X-Captcha` header when CAPTCHA is enabled for various storefront
44+
forms.
45+
versions: 2.3.6, 2.4.1
46+
type: New Topic
47+
date: October 15, 2020
48+
link: https://github.com/magento/devdocs/pull/7906
49+
contributor: keharper
50+
profile: https://github.com/keharper
51+
- description: Added the [`availableStores` query](https://devdocs.magento.com/guides/v2.4/graphql/queries/available-stores.html),
52+
which returns system configuration information from multiple store views. The
53+
query provides the context needed for a store switcher.
54+
versions: 2.4.1
55+
type: New Topic
56+
date: October 15, 2020
57+
link: https://github.com/magento/devdocs/pull/7853
58+
contributor: keharper
59+
profile: https://github.com/keharper
60+
- description: Added 2.4.1 beta [release notes](https://devdocs.magento.com/guides/v2.4/release-notes/bk-release-notes.html).
61+
versions: 2.4.1
62+
type: Major Update
63+
date: October 15, 2020
64+
link: https://github.com/magento/devdocs/pull/7846
65+
contributor: jfrontain
66+
profile: https://github.com/jfrontain
67+
- description: The [`addProductsToCart` mutation](https://devdocs.magento.com/guides/v2.4/graphql/mutations/add-products-to-cart.html)
68+
allows you to add any type of product to the active cart. We recommend using this
69+
mutation instead of single-purpose mutations such as `addSimpleProductsToCart`.
70+
versions: 2.4.1
71+
type: New Topic
72+
date: October 15, 2020
73+
link: https://github.com/magento/devdocs/pull/7774
74+
contributor: andrewbess
75+
profile: https://github.com/andrewbess
76+
- description: Added support for product reviews in GraphQL. Use the [createProductReview
77+
mutation](https://devdocs.magento.com/guides/v2.4/graphql/mutations/create-product-review.html)
78+
to add a review and the [productReviewRatingsMetadata query](https://devdocs.magento.com/guides/v2.4/graphql/queries/product-review-ratings-metadata.html)
79+
to retrieve information about the reviews infrastructure.
80+
versions: 2.4.1
81+
type: New Topic
82+
date: October 15, 2020
83+
link: https://github.com/magento/devdocs/pull/7775
84+
contributor: keharper
85+
profile: https://github.com/keharper
86+
- description: Added the ability to [add items](https://devdocs.magento.com/guides/v2.4/graphql/mutations/add-products-to-wishlist.html)
87+
to, [update items](https://devdocs.magento.com/guides/v2.4/graphql/mutations/update-products-in-wishlist.html)
88+
in, and [remove items](https://devdocs.magento.com/guides/v2.4/graphql/mutations/remove-products-from-wishlist.html)
89+
from a wish list in GraphQL.
90+
versions: 2.4.1
91+
type: New Topic
92+
date: October 15, 2020
93+
link: https://github.com/magento/devdocs/pull/7770
94+
contributor: keharper
95+
profile: https://github.com/keharper
96+
- description: Added the [`setGiftOptionsOnCart` mutation](https://devdocs.magento.com/guides/v2.4/graphql/mutations/set-gift-options.html)
97+
to set gift messages, gift wrapping, gift receipts, and printed cards to an entire
98+
order. The [`updateCartItems` mutation](https://devdocs.magento.com/guides/v2.4/graphql/mutations/update-cart-items.html)
99+
has been updated to allow adding a gift message or gift wrapping to individual
100+
products.
101+
versions: 2.4.1
102+
type: New Topic
103+
date: October 15, 2020
104+
link: https://github.com/magento/devdocs/pull/7745
105+
contributor: keharper
106+
profile: https://github.com/keharper
107+
- description: We have added the [`createCustomerV2`](https://devdocs.magento.com/guides/v2.4/graphql/mutations/create-customer-v2.html)
108+
and [`updateCustomerV2`](https://devdocs.magento.com/guides/v2.4/graphql/mutations/update-customer-v2.html)
109+
mutations to manage customer accounts. These new mutations require different input
110+
objects than the `createCustomer` and `updateCustomer` mutations. To change a
111+
customer's email address, use the new [`updateCustomerEmail`](https://devdocs.magento.com/guides/v2.4/graphql/mutations/update-customer-email.html)
112+
mutation.
113+
versions: 2.4.1
114+
type: New Topic
115+
date: October 15, 2020
116+
link: https://github.com/magento/devdocs/pull/7673
117+
contributor: keharper
118+
profile: https://github.com/keharper
119+
- description: Added GraphQL support for rewards points. Use the [`applyRewardPointsToCart`](https://devdocs.magento.com/guides/v2.4/graphql/mutations/apply-reward-points.html)
120+
and [`removeRewardPointsFromCart`](https://devdocs.magento.com/guides/v2.4/graphql/mutations/remove-reward-points.html)
121+
mutation to manage reward points within a cart. The [cart](https://devdocs.magento.com/guides/v2.4/graphql/queries/cart.html),
122+
[customer](https://devdocs.magento.com/guides/v2.4/graphql/queries/customer.html),
123+
and [storeConfig](https://devdocs.magento.com/guides/v2.4/graphql/queries/store-config.html)
124+
queries also return information related to reward points.
125+
versions: 2.4.1
126+
type: New Topic
127+
date: October 15, 2020
128+
link: https://github.com/magento/devdocs/pull/7662
129+
contributor: keharper
130+
profile: https://github.com/keharper
131+
- description: Added GraphQL Vault support with the [Payflow Pro Vault](https://devdocs.magento.com/guides/v2.4/graphql/payment-methods/payflow-pro-vault.html)
132+
payment method.
133+
versions: 2.4.1
134+
type: New Topic
135+
date: October 15, 2020
136+
link: https://github.com/magento/devdocs/pull/7714
137+
contributor: keharper
138+
profile: https://github.com/keharper
139+
- description: Added a [deprecation notice](https://devdocs.magento.com/guides/v2.3/install-gde/system-requirements-tech.html#technologies-magento-can-use)
140+
for Elasticsearch 6.x.
141+
versions: 2.3.6
142+
type: Technical
143+
date: October 15, 2020
144+
link: https://github.com/magento/devdocs/pull/7512
145+
contributor: jeff-matthews
146+
profile: https://github.com/jeff-matthews
147+
- description: Added the [`subscribeEmailToNewsletter` mutation](https://devdocs.magento.com/guides/v2.4/graphql/mutations/subscribe-email-to-newsletter.html)
148+
to the _GraphQL Developer Guide_.
149+
versions: 2.4.1
150+
type: New Topic
151+
date: October 15, 2020
152+
link: https://github.com/magento/devdocs/pull/7422
153+
contributor: atwixfirster
154+
profile: https://github.com/atwixfirster
155+
- description: The GraphQL [`customer` query](https://devdocs.magento.com/guides/v2.4/graphql/queries/customer.html)
156+
now returns detailed information about any order in the logged-in customer's order
157+
history. The query can now replicate what is displayed in the My Orders page
158+
in the storefront.
159+
versions: 2.4.1
160+
type: Major Update
161+
date: October 15, 2020
162+
link: https://github.com/magento/devdocs/pull/7436
163+
contributor: keharper
164+
profile: https://github.com/keharper
9165
- description: Added a [deprecation notice](https://devdocs.magento.com/cloud/configure/import-url-rewrites.html)
10166
for `magento/url-rewrite-import-export` module, which is no longer supported on
11167
Magento 2.4.x or later.

src/cloud/project/project-routes-more-redir.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ The following demonstrates how to manage redirection rules on your {{site.data.v
1212

1313
{% include cloud/note-route-all-placeholder.md %}
1414

15+
{:.bs-callout-warning}
16+
For {{ site.data.var.ece }} projects, configuring large numbers of non-regex redirects and rewrites in the `routes.yaml` file can cause performance issues. If your `routes.yaml` file is 32KB or larger, offload your non-regex redirects and rewrites to Fastly. See [Offload non-regex redirects to Fastly instead of Nginx (routes)](https://support.magento.com/hc/en-us/articles/360035192891-Offload-non-regex-redirects-to-Fastly-instead-of-Nginx-routes-) in the _Magento Help Center_.
17+
1518
## Whole-route redirects {#cloud-route-whole}
1619

1720
Using whole-route redirects, you can define simple routes using the `routes.yaml` file. For example, you can redirect from an apex domain to a `www` subdomain as follows:

src/cloud/release-notes/cloud-tools.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ This release information details the latest improvements to the {{site.data.var.
1414
| Release notes | Version | Description | Package source |
1515
| --- | --- | --- | --- |
1616
| [`{{site.data.var.ct}}` release notes] | {{site.data.var.ct-release}}<br/>2002.0.23| A set of scripts and tools designed to manage and deploy Cloud projects | [{{site.data.var.ct}}][ece package] |
17-
| [`{{site.data.var.mcp-prod}}` release notes] | {{site.data.var.mcp-release}} | A set of patches which improve the integration of all Magento versions with Cloud environments. This package includes Magento patches and available hotfixes that are applied when you use `{{site.data.var.ct}}` to deploy | [{{site.data.var.mcp}}][Patches package] |
18-
| [`{{site.data.var.mcd-prod}}` release notes] | {{site.data.var.mcd-release}} | Functionality and configuration files for Docker images to deploy Magento Commerce to a local Cloud environment | [{{site.data.var.mcd}}][Docker package] |
19-
| [`{{site.data.var.mcc-prod}}` release notes] | {{site.data.var.mcc-release}} | Extended Magento Commerce core functionality for sites deployed on the Cloud platform | [{{site.data.var.mcc}}][Components package] |
17+
| [`{{site.data.var.mcp-prod}}` release notes] | {{site.data.var.mcp-release}} | A set of patches which improve the integration of all Magento versions with Cloud environments. This package includes Magento patches and available hotfixes that are applied when you use `{{site.data.var.ct}}` to deploy | [{{site.data.var.mcp-package}}][Patches package] |
18+
| [`{{site.data.var.mcd-prod}}` release notes] | {{site.data.var.mcd-release}} | Functionality and configuration files for Docker images to deploy Magento Commerce to a local Cloud environment | [{{site.data.var.mcd-package}}][Docker package] |
19+
| [`{{site.data.var.mcc-prod}}` release notes] | {{site.data.var.mcc-release}} | Extended Magento Commerce core functionality for sites deployed on the Cloud platform | [{{site.data.var.mcc-package}}][Components package] |
2020

2121
When you update to `{{site.data.var.ct}}` 2002.1.0 or later, you automatically update to the latest versions of the other packages, which are dependencies for `{{site.data.var.ct}}`.
2222

src/cloud/release-notes/mcp-release-notes.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,17 @@ To ensure that your project has all required patches, update to the [latest vers
1919
{:.bs-callout-info}
2020
See [Apply patches]({{site.baseurl}}/cloud/project/project-patch.html) for instructions on applying patches to your Magento projects.
2121

22+
<!--Add release notes below-->
23+
24+
## v1.0.7
25+
*Release date: October 14, 2020*<br/>
26+
27+
- **Redis patches for Magento 2.3.0 to 2.3.5, 2.4.0**–Updated the Redis patches to support adding products to a category when implementing a Level 2 cache. <!--MCLOUD-6659-->
28+
29+
- **Braintree VBE patch**–Fixes an issue that generated an error when an Administrator tried to view a Braintree Settlement Report. <!--MCLOUD-6684-->
30+
31+
- Now, the `ece-patches apply` command uses the Unix `patch` command to apply patches if Git is not available on the host system. <!--MCLOUD-7069-->
32+
2233
## v1.0.6
2334
*Release date: {{ site.data.var.ece-release-date }}*<br/>
2435

src/contributor-guide/contributing.md

Lines changed: 83 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,11 @@ When you want to verify an issue or pull request, use the `instance` command to
206206
@magento give me {$version} instance
207207
```
208208

209-
For `version`, the currently supported values are latest [version tags](https://github.com/magento/magento2/tags) and the 2.4-develop branch.
209+
Replace `{$version}` with the version tag for the version required. The currently supported values are the latest [version tags](https://github.com/magento/magento2/tags) and the 2.4-develop branch. For example:
210+
211+
```text
212+
@magento give me 2.4.0 instance
213+
```
210214

211215
**Actions:** The following actions complete the command:
212216

@@ -248,6 +252,84 @@ Admins access will be shared via comment on GitHub.
248252
- Magento EngCom Team
249253
- [Contributor]({{ site.baseurl }}/contributor-guide/contributors.html)
250254

255+
### Customize deployed instances {#customize-deployed-instances}
256+
257+
In some cases a custom environment is required to test an issue or a pull request. You can create a custom environment by appending custom configuration settings to the PR comment to [Deploy a vanilla Magento instance](#vanilla-pr) or [Deploy an instance based on PR changes](#deploy-pr).
258+
259+
#### Magento edition
260+
261+
Append the following text to your PR comment to specify the Magento Commerce edition to use when you [Deploy a vanilla Magento instance](#vanilla-pr) or [Deploy an instance based on PR changes](#deploy-pr).
262+
263+
```text
264+
with edition {$edition}
265+
```
266+
267+
Replace `{$edition}` with either of the following values:
268+
269+
- `ee` deploys the Magento Commerce edition
270+
- `b2b` deploys Magento Commerce with B2B modules.
271+
272+
For example, append the following text to the PR comment to deploy a {{site.data.var.ee}} instance with B2B modules:
273+
274+
```text
275+
with edition b2b
276+
```
277+
278+
#### Environment
279+
280+
Append the following text to your PR comment to specify the version for applications and services to use when you [Deploy a vanilla Magento instance](#vanilla-pr) or [Deploy an instance based on PR changes](#deploy-pr).
281+
282+
```text
283+
with env PHP {$phpVersion}, search-engine ElasticSearch {$searchEngineVersion}, database {$dbEngine} {$dbEngineVersion}
284+
```
285+
286+
Replace variables in the command with the following values as needed for your environment:
287+
288+
- `{$phpVersion}`–Specify the PHP version for the instance.
289+
290+
- `{$searchEngineVersion}`–Specify the Elasticsearch version for the instance.
291+
292+
- `{$dbEngine}`–Specify the database type, either `MariaDB` or `MySQL`.
293+
294+
- `{$dbEngineVersion}`–Specify the version of the database engine for the instance.
295+
296+
For example, append the following text to the PR comment to deploy an instance with PHP 7.4, Elasticsearch version 7, and MariaDB version 10.4.
297+
298+
```text
299+
with env PHP 7.4, search-engine Elasticsearch 7, database MariaDB 10.4
300+
```
301+
302+
{:.bs-callout-info}
303+
We generally recommend that you deploy the default environment. Use the custom configuration options only when you require a special configuration to test specfic use cases.
304+
305+
#### Add extensions
306+
307+
Append the following text to your PR comment to specify extensions to add to an instance when you [Deploy a vanilla Magento instance](#vanilla-pr) or [Deploy an instance based on PR changes](#deploy-pr).
308+
309+
```text
310+
with extensions {$extensionRepo}
311+
```
312+
313+
Replace `{$extensionRepo}` with one or more extension repositories to include when compiling your instance. If you specify multiple repositories, use a comma after each repository. You can specify a specific branch in a repository using the pattern: `org/repo-name:branch-name`. For example:
314+
315+
```text
316+
with extensions magento/security-package:1.0-develop, magento/security-package-ee
317+
```
318+
319+
#### Remove extensions
320+
321+
Append the following text to your PR comment to specify extensions that you want to remove from the instance when you [Deploy a vanilla Magento instance](#vanilla-pr) or [Deploy an instance based on PR changes](#deploy-pr).
322+
323+
```text
324+
without extensions {$extensionRepo}
325+
```
326+
327+
Replace `{$extensionRepo}` with one or more extension repositories to remove before compiling your instance. If you specify multiple repositories, use a comma after each repository. For example:
328+
329+
```text
330+
without extensions magento/adobe-stock-integration
331+
```
332+
251333
### Combine multiple pull requests {#combine-pr}
252334

253335
To optimize the pull request queue, enter a command with a series of related pull request numbers to merge and test the code. If all tests pass, the entered PRs are merged into the current PR.

src/guides/v2.3/config-guide/prod/config-reference-var-name.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ content='
242242

243243
* To use values you set in the `$_ENV` array, you must set `variables_order = "EGPCS"` in your `php.ini` file. For details, see [PHP documentation](http://us.php.net/manual/en/ini.core.php#ini.variables-order).
244244

245-
* For Magento Commerce Cloud, if you are attempting to override Magento configuration settings using the [Project Web Interface]((https://devdocs.magento.com/guides/v2.3/cloud/project/project-webint-basic.html#project-conf-env-var), you must prepend the variable name with `env:`. For example:
245+
* For Magento Commerce Cloud, if you are attempting to override Magento configuration settings using the [Project Web Interface](https://devdocs.magento.com/cloud/project/project-webint-basic.html#project-conf-env-var), you must prepend the variable name with `env:`. For example:
246246

247247
![Environment variable example](https://devdocs.magento.com/common/images/cloud/cloud_env_var_example.png)'
248248

src/guides/v2.3/frontend-dev-guide/themes/theme-structure.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ The directories and files structure described below is the most extended one. It
136136
</td>
137137
<td colspan="1">required for a theme, but optional if it exists in the parent theme</td>
138138
<td colspan="1">
139-
This file contains configuration for all storefront product images and thumbnails.
139+
This file contains configurations for all storefront product images and thumbnails. It also contains product page, gallery widget configurations such as navigation options, fullscreen options and breakpoint conditions.
140140
</td>
141141
</tr>
142142
<tr>
@@ -197,7 +197,7 @@ The directories and files structure described below is the most extended one. It
197197
optional
198198
</td>
199199
<td colspan="1">
200-
Theme fonts.
200+
Contains theme fonts and customized icons.
201201
</td>
202202
</tr>
203203
<tr>

0 commit comments

Comments
 (0)