Skip to content

Commit 360b7fd

Browse files
mageprincemageprince
authored
Merge branch '2.3-develop' into develop
2 parents 58e2e4b + d9fb867 commit 360b7fd

File tree

17,370 files changed

+504982
-197305
lines changed

Some content is hidden

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

17,370 files changed

+504982
-197305
lines changed

‎.github/.htaccess

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<IfVersion < 2.4>
2+
Order deny,allow
3+
Deny from all
4+
</IfVersion>
5+
<IfVersion >= 2.4>
6+
Require all denied
7+
</IfVersion>

‎CODE_OF_CONDUCT.md renamed to ‎.github/CODE_OF_CONDUCT.md

File renamed without changes.

‎.github/CONTRIBUTING.md

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
# Contributing to Magento 2 code
2+
3+
Contributions to the Magento 2 codebase are done using the fork & pull model.
4+
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/).
5+
6+
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.
7+
8+
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.
9+
10+
11+
## Contribution requirements
12+
13+
1. Contributions must adhere to the [Magento coding standards](https://devdocs.magento.com/guides/v2.2/coding-standards/bk-coding-standards.html).
14+
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.
15+
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.
16+
4. PRs which include bug fixes must be accompanied with a step-by-step description of how to reproduce the bug.
17+
3. PRs which include new logic or new features must be submitted along with:
18+
* Unit/integration test coverage
19+
* Proposed [documentation](http://devdocs.magento.com) updates. Documentation contributions can be submitted via the [devdocs GitHub](https://github.com/magento/devdocs).
20+
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.
21+
5. All automated tests must pass (all builds on [Travis CI](https://travis-ci.org/magento/magento2) must be green).
22+
23+
## Contribution process
24+
25+
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.
26+
27+
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.
28+
2. Review the [Contributor License Agreement](https://magento.com/legaldocuments/mca) if this is your first time contributing.
29+
3. Create and test your work.
30+
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).
31+
5. Once your contribution is received the Magento 2 development team will review the contribution and collaborate with you as needed.
32+
33+
## Code of Conduct
34+
35+
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.
36+
The full text is available in the repository [Wiki](https://github.com/magento/magento2/wiki/Magento-Code-of-Conduct).

‎.github/ISSUE_TEMPLATE.md

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<!---
2+
Thank you for contributing to Magento.
3+
To help us process this issue we recommend that you add the following information:
4+
- Summary of the issue,
5+
- Information on your environment,
6+
- Steps to reproduce,
7+
- Expected and actual results,
8+
9+
Please also have a look at our guidelines article before adding a new issue https://github.com/magento/magento2/wiki/Issue-reporting-guidelines
10+
-->
11+
12+
### Preconditions
13+
<!---
14+
Please provide as detailed information about your environment as possible.
15+
For example Magento version, tag, HEAD, PHP & MySQL version, etc..
16+
-->
17+
1.
18+
2.
19+
20+
### Steps to reproduce
21+
<!---
22+
It is important to provide a set of clear steps to reproduce this bug.
23+
If relevant please include code samples
24+
-->
25+
1.
26+
2.
27+
3.
28+
29+
### Expected result
30+
<!--- Tell us what should happen -->
31+
1. [Screenshots, logs or description]
32+
33+
### Actual result
34+
<!--- Tell us what happens instead -->
35+
1. [Screenshots, logs or description]

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<!---
2+
Thank you for contributing to Magento.
3+
To help us process this pull request we recommend that you add the following information:
4+
- Summary of the pull request,
5+
- Issue(s) related to the changes made,
6+
- Manual testing scenarios,
7+
-->
8+
9+
<!--- Please provide a general summary of the Pull Request in the Title above -->
10+
11+
### Description
12+
<!---
13+
Please provide a description of the changes proposed in the pull request.
14+
Letting us know what has changed and why it needed changing will help us validate this pull request.
15+
-->
16+
17+
### Fixed Issues (if relevant)
18+
<!---
19+
If relevant, please provide a list of fixed issues in the format magento/magento2#<issue_number>.
20+
There could be 1 or more issues linked here and it will help us find some more information about the reasoning behind this change.
21+
-->
22+
1. magento/magento2#<issue_number>: Issue title
23+
2. ...
24+
25+
### Manual testing scenarios
26+
<!---
27+
Please provide a set of unambiguous steps to test the proposed code change.
28+
Giving us manual testing scenarios will help with the processing and validation process.
29+
-->
30+
1. ...
31+
2. ...
32+
33+
### Contribution checklist
34+
- [ ] Pull request has a meaningful description of its purpose
35+
- [ ] All commits are accompanied by meaningful commit messages
36+
- [ ] All new or changed code is covered with unit/integration tests (if applicable)
37+
- [ ] All automated tests passed successfully (all builds on Travis CI are green)

‎.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
/.metadata
44
/.project
55
/.settings
6+
/.vscode
67
atlassian*
78
/nbproject
89
/robots.txt
@@ -33,7 +34,6 @@ atlassian*
3334
/.php_cs.cache
3435
/grunt-config.json
3536
/dev/tools/grunt/configs/local-themes.js
36-
3737
/pub/media/*.*
3838
!/pub/media/.htaccess
3939
/pub/media/attribute/*

‎.htaccess

Lines changed: 130 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
############################################
3737
## adjust memory limit
3838

39-
php_value memory_limit 768M
39+
php_value memory_limit 756M
4040
php_value max_execution_time 18000
4141

4242
############################################
@@ -59,7 +59,7 @@
5959
############################################
6060
## adjust memory limit
6161

62-
php_value memory_limit 768M
62+
php_value memory_limit 756M
6363
php_value max_execution_time 18000
6464

6565
############################################
@@ -203,76 +203,166 @@
203203
RedirectMatch 403 /\.git
204204

205205
<Files composer.json>
206-
order allow,deny
207-
deny from all
206+
<IfVersion < 2.4>
207+
order allow,deny
208+
deny from all
209+
</IfVersion>
210+
<IfVersion >= 2.4>
211+
Require all denied
212+
</IfVersion>
208213
</Files>
209214
<Files composer.lock>
210-
order allow,deny
211-
deny from all
215+
<IfVersion < 2.4>
216+
order allow,deny
217+
deny from all
218+
</IfVersion>
219+
<IfVersion >= 2.4>
220+
Require all denied
221+
</IfVersion>
212222
</Files>
213223
<Files .gitignore>
214-
order allow,deny
215-
deny from all
224+
<IfVersion < 2.4>
225+
order allow,deny
226+
deny from all
227+
</IfVersion>
228+
<IfVersion >= 2.4>
229+
Require all denied
230+
</IfVersion>
216231
</Files>
217232
<Files .htaccess>
218-
order allow,deny
219-
deny from all
233+
<IfVersion < 2.4>
234+
order allow,deny
235+
deny from all
236+
</IfVersion>
237+
<IfVersion >= 2.4>
238+
Require all denied
239+
</IfVersion>
220240
</Files>
221241
<Files .htaccess.sample>
222-
order allow,deny
223-
deny from all
242+
<IfVersion < 2.4>
243+
order allow,deny
244+
deny from all
245+
</IfVersion>
246+
<IfVersion >= 2.4>
247+
Require all denied
248+
</IfVersion>
224249
</Files>
225250
<Files .php_cs.dist>
226-
order allow,deny
227-
deny from all
251+
<IfVersion < 2.4>
252+
order allow,deny
253+
deny from all
254+
</IfVersion>
255+
<IfVersion >= 2.4>
256+
Require all denied
257+
</IfVersion>
228258
</Files>
229259
<Files .travis.yml>
230-
order allow,deny
231-
deny from all
260+
<IfVersion < 2.4>
261+
order allow,deny
262+
deny from all
263+
</IfVersion>
264+
<IfVersion >= 2.4>
265+
Require all denied
266+
</IfVersion>
232267
</Files>
233268
<Files CHANGELOG.md>
234-
order allow,deny
235-
deny from all
236-
</Files>
237-
<Files CONTRIBUTING.md>
238-
order allow,deny
239-
deny from all
269+
<IfVersion < 2.4>
270+
order allow,deny
271+
deny from all
272+
</IfVersion>
273+
<IfVersion >= 2.4>
274+
Require all denied
275+
</IfVersion>
240276
</Files>
241277
<Files COPYING.txt>
242-
order allow,deny
243-
deny from all
278+
<IfVersion < 2.4>
279+
order allow,deny
280+
deny from all
281+
</IfVersion>
282+
<IfVersion >= 2.4>
283+
Require all denied
284+
</IfVersion>
244285
</Files>
245286
<Files Gruntfile.js>
246-
order allow,deny
247-
deny from all
287+
<IfVersion < 2.4>
288+
order allow,deny
289+
deny from all
290+
</IfVersion>
291+
<IfVersion >= 2.4>
292+
Require all denied
293+
</IfVersion>
248294
</Files>
249295
<Files LICENSE.txt>
250-
order allow,deny
251-
deny from all
296+
<IfVersion < 2.4>
297+
order allow,deny
298+
deny from all
299+
</IfVersion>
300+
<IfVersion >= 2.4>
301+
Require all denied
302+
</IfVersion>
252303
</Files>
253304
<Files LICENSE_AFL.txt>
254-
order allow,deny
255-
deny from all
305+
<IfVersion < 2.4>
306+
order allow,deny
307+
deny from all
308+
</IfVersion>
309+
<IfVersion >= 2.4>
310+
Require all denied
311+
</IfVersion>
256312
</Files>
257313
<Files nginx.conf.sample>
258-
order allow,deny
259-
deny from all
314+
<IfVersion < 2.4>
315+
order allow,deny
316+
deny from all
317+
</IfVersion>
318+
<IfVersion >= 2.4>
319+
Require all denied
320+
</IfVersion>
260321
</Files>
261322
<Files package.json>
262-
order allow,deny
263-
deny from all
323+
<IfVersion < 2.4>
324+
order allow,deny
325+
deny from all
326+
</IfVersion>
327+
<IfVersion >= 2.4>
328+
Require all denied
329+
</IfVersion>
264330
</Files>
265331
<Files php.ini.sample>
266-
order allow,deny
267-
deny from all
332+
<IfVersion < 2.4>
333+
order allow,deny
334+
deny from all
335+
</IfVersion>
336+
<IfVersion >= 2.4>
337+
Require all denied
338+
</IfVersion>
268339
</Files>
269340
<Files README.md>
270-
order allow,deny
271-
deny from all
341+
<IfVersion < 2.4>
342+
order allow,deny
343+
deny from all
344+
</IfVersion>
345+
<IfVersion >= 2.4>
346+
Require all denied
347+
</IfVersion>
272348
</Files>
273349
<Files magento_umask>
274-
order allow,deny
275-
deny from all
350+
<IfVersion < 2.4>
351+
order allow,deny
352+
deny from all
353+
</IfVersion>
354+
<IfVersion >= 2.4>
355+
Require all denied
356+
</IfVersion>
357+
</Files>
358+
<Files auth.json>
359+
<IfVersion < 2.4>
360+
order allow,deny
361+
deny from all
362+
</IfVersion>
363+
<IfVersion >= 2.4>
364+
Require all denied
365+
</IfVersion>
276366
</Files>
277367

278368
# For 404s and 403s that aren't handled by the application, show plain 404 response

0 commit comments

Comments
 (0)