Skip to content

Commit ced0413

Browse files
ishakhsuvarovishakhsuvarov
committed
#11554: Merge branch '2.2-develop' of github.com:magento/magento2ce into performance/import-attribute-validation
2 parents 976008d + a9a51f6 commit ced0413

File tree

3,797 files changed

+162724
-81279
lines changed

Some content is hidden

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

3,797 files changed

+162724
-81279
lines changed

‎.github/.htaccess‎

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

‎.github/CODE_OF_CONDUCT.md‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
# Contributor Covenant Code of Conduct
2+
3+
## Our Pledge
4+
5+
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.
6+
7+
## Our Standards
8+
9+
Examples of behavior that contributes to creating a positive environment include:
10+
11+
* Using welcoming and inclusive language
12+
* Being respectful of differing viewpoints and experiences
13+
* Gracefully accepting constructive criticism
14+
* Focusing on what is best for the community
15+
* Showing empathy towards other community members
16+
17+
Examples of unacceptable behavior by participants include:
18+
19+
* The use of sexualized language or imagery and unwelcome sexual attention or advances
20+
* Trolling, insulting/derogatory comments, and personal or political attacks
21+
* Public or private harassment
22+
* Publishing others' private information, such as a physical or electronic address, without explicit permission
23+
* Other conduct which could reasonably be considered inappropriate in a professional setting
24+
25+
## Our Responsibilities
26+
27+
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.
28+
29+
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.
30+
31+
## Scope
32+
33+
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.
34+
35+
## Enforcement
36+
37+
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [email protected]. 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.
38+
39+
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.
40+
41+
## Attribution
42+
43+
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
44+
45+
[homepage]: http://contributor-covenant.org
46+
[version]: http://contributor-covenant.org/version/1/4/

‎CONTRIBUTING.md‎ renamed to ‎.github/CONTRIBUTING.md‎

File renamed without changes.

‎ISSUE_TEMPLATE.md‎ renamed to ‎.github/ISSUE_TEMPLATE.md‎

File renamed without changes.

‎PULL_REQUEST_TEMPLATE.md‎ renamed to ‎.github/PULL_REQUEST_TEMPLATE.md‎

File renamed without changes.

‎.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>
348+
</Files>
349+
<Files auth.json>
350+
<IfVersion < 2.4>
351+
order allow,deny
352+
deny from all
353+
</IfVersion>
354+
<IfVersion >= 2.4>
355+
Require all denied
356+
</IfVersion>
272357
</Files>
273358
<Files magento_umask>
274-
order allow,deny
275-
deny from all
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)