forked from magento/magento2
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '2.3-develop' into develop
- Loading branch information
Showing
17,370 changed files
with
504,982 additions
and
197,305 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| <IfVersion < 2.4> | ||
| Order deny,allow | ||
| Deny from all | ||
| </IfVersion> | ||
| <IfVersion >= 2.4> | ||
| Require all denied | ||
| </IfVersion> |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| # Contributing to Magento 2 code | ||
|
|
||
| Contributions to the Magento 2 codebase are done using the fork & pull model. | ||
| This contribution model has contributors maintaining their own copy of the forked codebase (which can easily be synced with the main copy). The forked repository is then used to submit a request to the base repository to “pull” a set of changes. For more information on pull requests please refer to [GitHub Help](https://help.github.com/articles/about-pull-requests/). | ||
|
|
||
| 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 or optimizations. | ||
|
|
||
| The Magento 2 development team will review all issues and contributions submitted by the community of developers in the first in, first out order. During the review we might require clarifications from the contributor. If there is no response from the contributor within two weeks, the pull request will be closed. | ||
|
|
||
|
|
||
| ## Contribution requirements | ||
|
|
||
| 1. Contributions must adhere to the [Magento coding standards](https://devdocs.magento.com/guides/v2.2/coding-standards/bk-coding-standards.html). | ||
| 2. Pull requests (PRs) must be accompanied by a meaningful description of their purpose. Comprehensive descriptions increase the chances of a pull request being merged quickly and without additional clarification requests. | ||
| 3. Commits must be accompanied by meaningful commit messages. Please see the [Magento Pull Request Template](https://github.com/magento/magento2/blob/2.2-develop/.github/PULL_REQUEST_TEMPLATE.md) for more information. | ||
| 4. PRs which include bug fixes must be accompanied with a step-by-step description of how to reproduce the bug. | ||
| 3. PRs which include new logic or new features must be submitted along with: | ||
| * Unit/integration test coverage | ||
| * Proposed [documentation](http://devdocs.magento.com) updates. Documentation contributions can be submitted via the [devdocs GitHub](https://github.com/magento/devdocs). | ||
| 4. For larger features or changes, please [open an issue](https://github.com/magento/magento2/issues) to discuss the proposed changes prior to development. This may prevent duplicate or unnecessary effort and allow other contributors to provide input. | ||
| 5. All automated tests must pass (all builds on [Travis CI](https://travis-ci.org/magento/magento2) must be green). | ||
|
|
||
| ## Contribution process | ||
|
|
||
| If you are a new GitHub user, we recommend that you create your own [free github account](https://github.com/signup/free). This will allow you to collaborate with the Magento 2 development team, fork the Magento 2 project and send pull requests. | ||
|
|
||
| 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://magento.com/legaldocuments/mca) if this is your first time contributing. | ||
| 3. Create and test your work. | ||
| 4. Fork the Magento 2 repository according to the [Fork A Repository instructions](http://devdocs.magento.com/guides/v2.2/contributor-guide/contributing.html#fork) and when you are ready to send us a pull request – follow the [Create A Pull Request instructions](http://devdocs.magento.com/guides/v2.2/contributor-guide/contributing.html#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 | ||
|
|
||
| Please note that this project is released with a Contributor Code of Conduct. We expect you to agree to its terms when participating in this project. | ||
| The full text is available in the repository [Wiki](https://github.com/magento/magento2/wiki/Magento-Code-of-Conduct). |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| <!--- | ||
| Thank you for contributing to Magento. | ||
| To help us process this issue we recommend that you add the following information: | ||
| - Summary of the issue, | ||
| - Information on your environment, | ||
| - Steps to reproduce, | ||
| - Expected and actual results, | ||
| Please also have a look at our guidelines article before adding a new issue https://github.com/magento/magento2/wiki/Issue-reporting-guidelines | ||
| --> | ||
|
|
||
| ### Preconditions | ||
| <!--- | ||
| Please provide as detailed information about your environment as possible. | ||
| For example Magento version, tag, HEAD, PHP & MySQL version, etc.. | ||
| --> | ||
| 1. | ||
| 2. | ||
|
|
||
| ### Steps to reproduce | ||
| <!--- | ||
| It is important to provide a set of clear steps to reproduce this bug. | ||
| If relevant please include code samples | ||
| --> | ||
| 1. | ||
| 2. | ||
| 3. | ||
|
|
||
| ### Expected result | ||
| <!--- Tell us what should happen --> | ||
| 1. [Screenshots, logs or description] | ||
|
|
||
| ### Actual result | ||
| <!--- Tell us what happens instead --> | ||
| 1. [Screenshots, logs or description] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| <!--- | ||
| Thank you for contributing to Magento. | ||
| To help us process this pull request we recommend that you add the following information: | ||
| - Summary of the pull request, | ||
| - Issue(s) related to the changes made, | ||
| - Manual testing scenarios, | ||
| --> | ||
|
|
||
| <!--- Please provide a general summary of the Pull Request in the Title above --> | ||
|
|
||
| ### Description | ||
| <!--- | ||
| Please provide a description of the changes proposed in the pull request. | ||
| Letting us know what has changed and why it needed changing will help us validate this pull request. | ||
| --> | ||
|
|
||
| ### Fixed Issues (if relevant) | ||
| <!--- | ||
| If relevant, please provide a list of fixed issues in the format magento/magento2#<issue_number>. | ||
| There could be 1 or more issues linked here and it will help us find some more information about the reasoning behind this change. | ||
| --> | ||
| 1. magento/magento2#<issue_number>: Issue title | ||
| 2. ... | ||
|
|
||
| ### Manual testing scenarios | ||
| <!--- | ||
| Please provide a set of unambiguous steps to test the proposed code change. | ||
| Giving us manual testing scenarios will help with the processing and validation process. | ||
| --> | ||
| 1. ... | ||
| 2. ... | ||
|
|
||
| ### Contribution checklist | ||
| - [ ] Pull request has a meaningful description of its purpose | ||
| - [ ] All commits are accompanied by meaningful commit messages | ||
| - [ ] All new or changed code is covered with unit/integration tests (if applicable) | ||
| - [ ] All automated tests passed successfully (all builds on Travis CI are green) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.