Skip to content

Commit 8cb33c4

Browse files
committed
Merge branch '2.3-develop' of https://github.com/magento/magento2ce into MC-13951-Declarative-upgrade-leads-to-the-re-creation-of-indexes
2 parents b949452 + 4321600 commit 8cb33c4

File tree

332 files changed

+8422
-1563
lines changed

Some content is hidden

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

332 files changed

+8422
-1563
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Fields marked with (*) are required. Please don't remove the template.
1111

1212
### Preconditions (*)
1313
<!---
14-
Provide the exact Magento version (example: 2.2.5) and any important information on the environment where bug is reproducible.
14+
Provide the exact Magento version (example: 2.3.2) and any important information on the environment where bug is reproducible.
1515
-->
1616
1.
1717
2.

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Welcome to Magento 2 installation! We're glad you chose to install Magento 2, a
99

1010
## Install Magento
1111

12-
* [Installation Guide](https://devdocs.magento.com/guides/v2.3/install-gde/bk-install-guide.html).
12+
* [Installation Guide](https://devdocs.magento.com/guides/v2.3/install-gde/bk-install-guide.html).
1313

1414
## Learn More About GraphQL in Magento 2
1515

@@ -18,7 +18,7 @@ Welcome to Magento 2 installation! We're glad you chose to install Magento 2, a
1818
<h2>Contributing to the Magento 2 Code Base</h2>
1919
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, optimizations, or just good suggestions.
2020

21-
To learn about how to make a contribution, click [here][1].
21+
To learn about how to contribute, click [here][1].
2222

2323
To learn about issues, click [here][2]. To open an issue, click [here][3].
2424

@@ -37,7 +37,7 @@ The members of this team have been recognized for their outstanding commitment t
3737
</a>
3838

3939
<h3>Top Contributors</h3>
40-
Magento is thankful for any contribution that can improve our code base, documentation or increase test coverage. We always recognize our most active members, as their contributions are the foundation of the Magento Open Source platform.
40+
Magento is thankful for any contribution that can improve our codebase, documentation or increase test coverage. We always recognize our most active members, as their contributions are the foundation of the Magento Open Source platform.
4141
<a href="https://magento.com/magento-contributors">
4242
<img src="https://raw.githubusercontent.com/wiki/magento/magento2/images/contributors.png"/>
4343
</a>
@@ -48,7 +48,7 @@ Please review the [Code Contributions guide](https://devdocs.magento.com/guides/
4848

4949
## Reporting Security Issues
5050

51-
To report security vulnerabilities or learn more about reporting security issues in Magento software or web sites visit the [Magento Bug Bounty Program](https://hackerone.com/magento) on hackerone. Please create a hackerone account [there](https://hackerone.com/magento) to submit and follow-up your issue.
51+
To report security vulnerabilities or learn more about reporting security issues in Magento software or web sites visit the [Magento Bug Bounty Program](https://hackerone.com/magento) on hackerone. Please create a hackerone account [there](https://hackerone.com/magento) to submit and follow-up on your issue.
5252

5353
Stay up-to-date on the latest security news and patches for Magento by signing up for [Security Alert Notifications](https://magento.com/security/sign-up).
5454

@@ -64,7 +64,7 @@ Please see LICENSE_EE.txt for the full text of the MEE License or visit https://
6464

6565
## Community Engineering Slack
6666

67-
To connect with Magento and the Community, join us on the [Magento Community Engineering Slack](https://magentocommeng.slack.com). If you are interested in joining Slack, or a specific channel, send us request at [engcom@adobe.com](mailto:engcom@adobe.com) or [self signup](https://tinyurl.com/engcom-slack).
67+
To connect with Magento and the Community, join us on the [Magento Community Engineering Slack](https://magentocommeng.slack.com). If you are interested in joining Slack, or a specific channel, send us a request at [engcom@adobe.com](mailto:engcom@adobe.com) or [self signup](https://tinyurl.com/engcom-slack).
6868

6969

7070
We have channels for each project. These channels are recommended for new members:

app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,7 @@ public function export()
216216
if ($entityCollection->count() == 0) {
217217
break;
218218
}
219+
$entityCollection->clear();
219220
$exportData = $this->getExportData();
220221
foreach ($exportData as $dataRow) {
221222
$writer->writeRow($dataRow);

0 commit comments

Comments
 (0)