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

Commit 7cd7941

Browse files
authored
Merge branch 'master' into update_uct_errors_references
2 parents 5485934 + 24e2b0c commit 7cd7941

File tree

7 files changed

+35
-158
lines changed

7 files changed

+35
-158
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.

src/contributor-guide/contributing.md

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,6 @@ redirect_from:
66
- guides/v2.4/contributor-guide/contributing.html
77
---
88

9-
The following topics are included in this guide:
10-
11-
- [Contribute to Magento 2 code](#contribute)
12-
- [Community Backlog Priority](#backlog)
13-
- [GitHub and Two-Factor authentication](#two-factor)
14-
- [Questions or enhancement requests?](#question)
15-
- [Accepted pull requests and ported code](#rules)
16-
- [Contribution requirements](#requirements)
17-
- [Forks and pull requests](#forks-and-pull-requests)
18-
- [Squash commits](#squash-commits)
19-
- [Magento Contributor Assistant](#contributor-assist)
20-
- [Report an issue](#report)
21-
- [Help triage issues](#triage)
22-
- [Labels applied by the Community Engineering team](#labels)
23-
- [Contribution awards and points](#points)
24-
259
{:.bs-callout-tip}
2610
Connect with Magento Contributors and Maintainers to learn more about Magento contributions and special projects. Join us in our [Slack workspace](https://opensource.magento.com/slack), in the [#general](https://magentocommeng.slack.com/archives/C4YS78WE6) channel, follow the [#announcements](https://magentocommeng.slack.com/archives/C7FA71S3V), and browse for more [channels](https://devdocs.magento.com/community/resources/resources.html#community-engineering-slack)!
2711

@@ -96,7 +80,7 @@ The following list consists of questions you can ask to help determine the prope
9680

9781
The number of 'Yes' answers should help you to determine the severity.
9882

99-
### Pull request risk assessment:
83+
### Pull request risk assessment
10084

10185
The 'Risk:' label highlights the risk that the suggested changes may bring to the platform.
10286
It helps maintainers decide:
@@ -111,7 +95,7 @@ It helps maintainers decide:
11195
| Medium | A pull request that makes changes which may affect multiple areas or makes considerable changes on a specific area. |
11296
| Low | A pull request that will probably not affect other areas. |
11397

114-
## GitHub and Two-Factor authentication {#two-factor}
98+
## GitHub and two-factor authentication {#two-factor}
11599

116100
Magento **requires all Partners** who contribute code to enable 2FA on their GitHub accounts. You can use a mobile device or 2FA application for added protection. See [Configuring two-factor authentication](https://help.github.com/en/articles/configuring-two-factor-authentication) in the GitHub help.
117101

@@ -388,7 +372,7 @@ If you are sure that the problem you are experiencing is a bug, file a new issue
388372

389373
### Issue template
390374

391-
The [Issue Reporting Template](https://github.com/magento/magento2/blob/2.3-develop/.github/ISSUE_TEMPLATE.md) is a default placeholder for every new issue. Follow the sections carefully, as it ensures it will pass `Gate 1` quickly. More information on gates is available in [Magento Issue Gates](https://github.com/magento/magento2/wiki/Magento-Issue-Gates).
375+
The [Issue Reporting Template](https://github.com/magento/magento2/blob/{{site.version}}-develop/.github/ISSUE_TEMPLATE.md) is a default placeholder for every new issue. Follow the sections carefully, as it ensures it will pass `Gate 1` quickly. More information on gates is available in [Magento Issue Gates](https://github.com/magento/magento2/wiki/Magento-Issue-Gates).
392376

393377
{:.bs-callout-tip}
394378
Note that a higher level of detail in the report increases the chance that someone will be able to reproduce the issue.
@@ -463,7 +447,3 @@ In addition to contributing code, you can help triage issues. This can include r
463447
We apply labels to public pull requests and issues to help other participants retrieve additional information about current progress, component assignments, Magento release lines, and much more. The following information details global labels used in Magento 2 repositories and across Community Engineering contributions.
464448

465449
{% include contributor/labels.md %}
466-
467-
## Contribution awards and points {#points}
468-
469-
{% include contributor/rewards.md %}

src/contributor-guide/contributors.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ redirect_from:
77
- guides/v2.4/contributor-guide/contributors.html
88
---
99

10-
Thanks to the following community members, partners, and Magento fans who contribute to Magento open source projects.
10+
Many thanks to our community members, partners, and Magento fans who contribute to our open source projects.
1111

12-
{% include home/contributors.html %}
12+
Check out the [Top Contributors Leaderboard][biterg].
13+
14+
<!-- Link definitions -->
15+
[biterg]: https://magento.biterg.io/app/kibana#/dashboard/41dc0c60-fa06-11eb-bbaa-dd6ca6f8fda8?_g=(refreshInterval%3A(pause%3A!t%2Cvalue%3A0)%2Ctime%3A(from%3Anow%2Fy%2Cmode%3Aquick%2Cto%3Anow)

0 commit comments

Comments
 (0)