Skip to content

Commit

Permalink
Merge pull request #1 from magento/2.4-develop
Browse files Browse the repository at this point in the history
pull
  • Loading branch information
yogesh-valiya authored Mar 4, 2023
2 parents 2a774fc + aab3ee6 commit 6a95192
Show file tree
Hide file tree
Showing 5,107 changed files with 117,906 additions and 158,941 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
74 changes: 54 additions & 20 deletions .github/CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -1,46 +1,80 @@
# Contributor Covenant Code of Conduct
# Magento Code of Conduct

## Our Pledge

In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
We as members, contributors, and leaders pledge to make participation in our project and community a harassment-free experience for everyone, regardless of age, body size, visible or invisible disability, ethnicity, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, caste, color, religion, or sexual identity and orientation.

We pledge to act and interact in ways that contribute to an open, welcoming, diverse, inclusive, and healthy community.


## Our Standards

Examples of behavior that contributes to creating a positive environment include:
Examples of behavior that contribute to a positive environment for our project and community include:


* Demonstrating empathy and kindness toward other people
* Being respectful of differing opinions, viewpoints, and experiences
* Giving and gracefully accepting constructive feedback
* Accepting responsibility and apologizing to those affected by our mistakes, and learning from the experience
* Focusing on what is best, not just for us as individuals but for the overall community

* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery and unwelcome sexual attention or advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* The use of sexualized language or imagery and sexual attention or advances of any kind
* Trolling, insulting or derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic address, without explicit permission
* Publishing others private information, such as a physical or email address, without their explicit permission
* Other conduct which could reasonably be considered inappropriate in a professional setting


## Our Responsibilities

Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
Project maintainers are responsible for clarifying and enforcing our standards of acceptable behavior and will take appropriate and fair corrective action in response to any instances of unacceptable behavior.

Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for behaviors that they deem inappropriate, threatening, offensive, or harmful.

## Scope

This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
This Code of Conduct applies when an individual is representing the project or its community both within project spaces and in public spaces. Examples of representing a project or community include using an official e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at engcom@magento.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by first contacting the project team at engcom@adobe.com. Oversight of Adobe projects is handled by the Adobe Open Source Office, which has final say in any violations and enforcement of this Code of Conduct and can be reached at Grp-opensourceoffice@adobe.com. All complaints will be reviewed and investigated promptly and fairly.

Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
The project team must respect the privacy and security of the reporter of any incident.

## Attribution
Project maintainers who do not follow or enforce the Code of Conduct may face temporary or permanent repercussions as determined by other members of the project's leadership or the Adobe Open Source Office.


## Enforcement Guidelines

Project maintainers will follow these Community Impact Guidelines in determining the consequences for any action they deem to be in violation of this Code of Conduct:

### 1. Correction

Community Impact: Use of inappropriate language or other behavior deemed unprofessional or unwelcome in the community.
Consequence: A private, written warning from project maintainers describing the violation and why the behavior was unacceptable. A public apology may be requested from the violator before any further involvement in the project by violator.

This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
### 2. Warning

Community Impact: A relatively minor violation through a single incident or series of actions.

Consequence: A written warning from project maintainers that includes stated consequences for continued unacceptable behavior. Violator must refrain from interacting with the people involved for a specified period of time as determined by the project maintainers, including, but not limited to, unsolicited interaction with those enforcing the Code of Conduct through channels such as community spaces and social media. Continued violations may lead to a temporary or permanent ban.

### 3. Temporary Ban

Community Impact: A more serious violation of community standards, including sustained unacceptable behavior.

Consequence: A temporary ban from any interaction or public communication with the community for a specified period of time. No public or private interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, is allowed during this period. Failure to comply with the temporary ban may lead to a permanent ban.

### 4. Permanent Ban

Community Impact: Demonstrating a consistent pattern of violation of community standards or an egregious violation of community standards, including, but not limited to, sustained inappropriate behavior, harassment of an individual, or aggression toward or disparagement of classes of individuals.

Consequence: A permanent ban from any interaction with the community.


## Attribution

[homepage]: http://contributor-covenant.org
[version]: http://contributor-covenant.org/version/1/4/
This Code of Conduct is adapted from the Contributor Covenant, version 2.1, available at https://www.contributor-covenant.org/version/2/1/code_of_conduct.html.
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ This will allow you to collaborate with the Magento 2 development team, fork the
1. Search current [listed issues](https://github.com/magento/magento2/issues) (open or closed) for similar proposals of intended contribution before starting work on a new contribution.
2. Review the [Contributor License Agreement](https://opensource.adobe.com/cla.html) if this is your first time contributing.
3. Create and test your work.
4. Follow the [Forks And Pull Requests Instructions](https://devdocs.magento.com/contributor-guide/contributing.html#forks-and-pull-requests) to fork the Magento 2 repository and send us a pull request.
4. Follow the [Forks And Pull Requests Instructions](https://developer.adobe.com/commerce/contributor/guides/code-contributions/) to fork the Magento 2 repository and send us a pull request.
5. Once your contribution is received the Magento 2 development team will review the contribution and collaborate with you as needed.

## Code of Conduct
Expand Down
43 changes: 0 additions & 43 deletions .github/ISSUE_TEMPLATE/bug_report.md

This file was deleted.

72 changes: 72 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
name: Bug report
description: Technical issue with the Magento 2 core components
body:
- type: markdown
attributes:
value: |
Please read [our guidelines](https://developer.adobe.com/commerce/contributor/guides/code-contributions/#report-an-issue) before submitting the issue.
- type: textarea
attributes:
label: Preconditions and environment
description: |
Describe your environment.
Provide all the details that will help us to reproduce the bug.
value: |
- Magento version
- Anything else that would help a developer reproduce the bug
- type: textarea
attributes:
label: Steps to reproduce
description: |
Provide a set of clear steps to reproduce this bug.
placeholder: |
Example:
1. Navigate to storefront as a guest.
2. Open Test Category.
3. Click “Add to Cart” on the Virtual Product.
4. Open mini shopping cart and click “Proceed to Checkout”.
validations:
required: true
- type: textarea
attributes:
label: Expected result
description: |
Tell us what you expected to happen.
placeholder: |
Example:
Order is placed successfully, customer is redirected to the success page.
validations:
required: true
- type: textarea
attributes:
label: Actual result
description: |
Tell us what happened. Include error messages and issues.
placeholder: |
Example:
“Place order” button is not visible, order cannot be placed.
validations:
required: true
- type: textarea
attributes:
label: Additional information
description: |
Additional information is often requested when the bug report is processed. You can save time by providing both Magento and browser logs, screenshots, repository branch and HEAD commit you checked out to install Magento and any other artifacts related to the issue.
Also, links to the comments with important information, Root Cause analysis, additional video recordings; and anything else that is important for the issue and at some reason cannot be added to other sections.
- type: textarea
attributes:
label: Release note
description: |
Help us to provide meaningful release notes to the community.
- type: checkboxes
attributes:
label: Triage and priority
description: |
Provide [Severity](https://developer.adobe.com/commerce/contributor/guides/code-contributions/#community-backlog-priority) assessment for the Issue as a Reporter.
This information helps us during the Confirmation and Issue triage processes.
options:
- label: 'Severity: **S0** _- Affects critical data or functionality and leaves users without workaround._'
- label: 'Severity: **S1** _- Affects critical data or functionality and forces users to employ a workaround._'
- label: 'Severity: **S2** _- Affects non-critical data or functionality and forces users to employ a workaround._'
- label: 'Severity: **S3** _- Affects non-critical data or functionality and does not force users to employ a workaround._'
- label: 'Severity: **S4** _- Affects aesthetics, professional look and feel, “quality” or “usability”._'
29 changes: 0 additions & 29 deletions .github/ISSUE_TEMPLATE/developer-experience-issue.md

This file was deleted.

45 changes: 45 additions & 0 deletions .github/ISSUE_TEMPLATE/developer_experience_issue.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
name: Developer experience issue
description: Issues related to customization, extensibility, modularity
labels: ['Triage: Dev.Experience']
body:
- type: markdown
attributes:
value: |
Please read [our guidelines](https://developer.adobe.com/commerce/contributor/guides/code-contributions/#report-an-issue) before submitting the issue.
- type: textarea
attributes:
label: Summary
description: |
Describe the issue you are experiencing.
Include general information, error messages, environments, and so on.
validations:
required: true
- type: textarea
attributes:
label: Examples
description: |
Provide code examples or a patch with a test (recommended) to clearly indicate the problem.
validations:
required: true
- type: textarea
attributes:
label: Proposed solution
description: |
Suggest your potential solutions for this issue.
- type: textarea
attributes:
label: Release note
description: |
Help us to provide meaningful release notes to the community.
- type: checkboxes
attributes:
label: Triage and priority
description: |
Provide [Severity](https://developer.adobe.com/commerce/contributor/guides/code-contributions/#community-backlog-priority) assessment for the Issue as a Reporter.
This information helps us during the Confirmation and Issue triage processes.
options:
- label: 'Severity: **S0** _- Affects critical data or functionality and leaves users without workaround._'
- label: 'Severity: **S1** _- Affects critical data or functionality and forces users to employ a workaround._'
- label: 'Severity: **S2** _- Affects non-critical data or functionality and forces users to employ a workaround._'
- label: 'Severity: **S3** _- Affects non-critical data or functionality and does not force users to employ a workaround._'
- label: 'Severity: **S4** _- Affects aesthetics, professional look and feel, “quality” or “usability”._'
22 changes: 0 additions & 22 deletions .github/ISSUE_TEMPLATE/feature_request.md

This file was deleted.

Loading

0 comments on commit 6a95192

Please sign in to comment.