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

Commit a2f7b49

Browse files
authored
Merge branch 'master' into patch-3
2 parents a9db146 + c2abd4b commit a2f7b49

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

src/_includes/contributor/rewards.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@ Special achievement | 20 | Contribution earns recognition in a specific category
5656
Test coverage | 10 | Contribution contains a fix or improvement and new tests or test cases.
5757
MFTF test coverage| 10 | Contribution contains MFTF tests.
5858
Bug fix | 10 | Contribution fixes one or more known GitHub issues.
59-
Author of Ported Issue | 5 | Additional points for a contribution that ports (up port or back port) a previous PR across release lines by another contributor
59+
Author of Ported Issue | 5 | Additional points for a contribution that ports (up port or back port) a previous PR across release lines by another contributor.
60+
Category of Expertise | 5 | Additional points for a contribution that required deeper investigation and expertise.
6061
Issue Triage: Confirmed | 5 | A public issue report is verified and confirmed. The description contains all the required information needed to easily reproduce the issue with the provided steps.
6162
Issue Triage: Rejected/Closed | 4 | A public issue report is verified and closed/rejected because it is not a bug or cannot be reproduce using the provided steps in the description on the supported Magento versions.
6263

src/guides/v2.3/extension-dev-guide/build/di-xml-file.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,11 @@ Node Format:
236236
</config>
237237
```
238238

239+
{:.bs-callout-warning}
240+
**Arguments on different stages**
241+
<br/>
242+
Configuration arguments are merged when they are declared on the same stage (Initial, Global, or Area-Specifc). If you declare new arguments on a higher stage, like Area-Specific, the arguments declared on the higher stage will replace the existing ones.
243+
239244
{:.bs-callout-info}
240245
**Merging and Arguments**
241246
<br/>

0 commit comments

Comments
 (0)