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

Commit fdca208

Browse files
authored
Merge branch 'master' into AC-1509
2 parents f17ec06 + e3a1b80 commit fdca208

File tree

8 files changed

+124
-246
lines changed

8 files changed

+124
-246
lines changed

.github/CONTRIBUTING.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,9 @@ DevDocs staff members and [Community Maintainers](https://devdocs.magento.com/co
88

99
## Rewards for contributions
1010

11-
DevDocs works with Magento Community Engineering teams and projects.
12-
As you contribute PRs, you gain [Contribution Points](https://devdocs.magento.com/contributor-guide/contributing.html#points).
13-
1411
If you write and contribute a full topic, we will add your name (or your company's name) at the top of the DevDocs page and link it to your blog or website!
1512

16-
If you contribute a major update to a topic, your GitHub username will be added to a description of the update in our [What's New topic](https://devdocs.magento.com/whats-new.html).
13+
If you contribute a new topic or a major update to a topic, your GitHub username will be added to a description of the update in our [What's New topic](https://devdocs.magento.com/whats-new.html).
1714

1815
## Get started
1916

src/_data/whats-new.yml

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,33 @@ 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: Mon Nov 1 14:38:45 2021
7+
updated: Mon Nov 8 15:38:46 2021
88
entries:
9+
- description: Added hotfix information to the [Adobe Commerce 2.3.7-p2 release notes](https://devdocs.magento.com/guides/v2.3/release-notes/2-3-7-p2.html)
10+
and [Adobe Commerce 2.4.3-p1 release notes](https://devdocs.magento.com/guides/v2.4/release-notes/2-4-3-p1.html)
11+
versions: 2.3.x, 2.4.x
12+
type: Major Update
13+
date: November 5, 2021
14+
link: https://github.com/magento-commerce/devdocs/pull/2623
15+
merge_commit: ce18ee23ed3e59b9ca561b82e28edbd9cd46fcbe
16+
contributor: jfrontain
17+
membership: true
18+
labels:
19+
- Major Update
20+
- 2.3.x
21+
- 2.4.x
22+
- description: Added the [Github Issue Processing Workflow](https://devdocs.magento.com/contributor-guide/processing-workflow.html)
23+
topic to the Contributor's Guide.
24+
versions: 2.x
25+
type: New Topic
26+
date: November 5, 2021
27+
link: https://github.com/magento-commerce/devdocs/pull/2578
28+
merge_commit: 18306a54a9151938b0e2441c5a567e547ee6c869
29+
contributor: dobooth
30+
membership: true
31+
labels:
32+
- 2.x
33+
- New Topic
934
- description: Moved the [Adobe Commerce Beta Program](https://devdocs.magento.com/release/beta-program.html)
1035
topic from the `magento/magento2` GitHub wiki to devdocs.magento.com.
1136
versions: 2.x

src/_includes/contributor/labels.md

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,6 @@ Progress labels indicate the Pull Request status on each review stage:
1616
* `Progress: accept` - The pull request has been accepted and will be merged into mainline code. <!-- accept -->
1717
* `Progress: reject` - The pull request has been rejected and will not be merged into mainline code. Possible reasons can include but are not limited to: issue has already been fixed in another code contribution, or there is an issue with the code contribution. <!-- reject -->
1818

19-
### Contribution awards
20-
{:.no_toc}
21-
22-
The level of investigation, research, and work required for a task may differ. Contribution Rewards labels indicate what type of contribution awards will be applied when completing an issue and PR. Some awards will provide higher points and rewards than others.
23-
24-
* `Award: complex`
25-
* `Award: advanced`
26-
* `Award: special achievement`
27-
* `Award: category of expertise`
28-
* `Award: test coverage`
29-
* `Award: devdocs update`
30-
* `Award: MFTF test coverage`
31-
* `Award: bug fix`
32-
* `Cleanup`
33-
* `Port`
34-
3519
### Partners
3620
{:.no_toc}
3721

src/_includes/contributor/rewards.md

Lines changed: 0 additions & 106 deletions
This file was deleted.

src/_includes/home/contributors.html

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)