Skip to content

Commit cb304db

Browse files
author
Jeroen van Leusden
committed
Merge branch '2.2-develop' into patch-5
2 parents d7f6baa + 60a4372 commit cb304db

File tree

2,531 files changed

+101808
-71476
lines changed

Some content is hidden

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

2,531 files changed

+101808
-71476
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 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.
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: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -274,15 +274,6 @@
274274
Require all denied
275275
</IfVersion>
276276
</Files>
277-
<Files CONTRIBUTING.md>
278-
<IfVersion < 2.4>
279-
order allow,deny
280-
deny from all
281-
</IfVersion>
282-
<IfVersion >= 2.4>
283-
Require all denied
284-
</IfVersion>
285-
</Files>
286277
<Files COPYING.txt>
287278
<IfVersion < 2.4>
288279
order allow,deny
@@ -355,6 +346,15 @@
355346
Require all denied
356347
</IfVersion>
357348
</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>
357+
</Files>
358358
<Files magento_umask>
359359
<IfVersion < 2.4>
360360
order allow,deny

‎.htaccess.sample

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -251,15 +251,6 @@
251251
Require all denied
252252
</IfVersion>
253253
</Files>
254-
<Files CONTRIBUTING.md>
255-
<IfVersion < 2.4>
256-
order allow,deny
257-
deny from all
258-
</IfVersion>
259-
<IfVersion >= 2.4>
260-
Require all denied
261-
</IfVersion>
262-
</Files>
263254
<Files COPYING.txt>
264255
<IfVersion < 2.4>
265256
order allow,deny
@@ -332,6 +323,15 @@
332323
Require all denied
333324
</IfVersion>
334325
</Files>
326+
<Files auth.json>
327+
<IfVersion < 2.4>
328+
order allow,deny
329+
deny from all
330+
</IfVersion>
331+
<IfVersion >= 2.4>
332+
Require all denied
333+
</IfVersion>
334+
</Files>
335335
<Files magento_umask>
336336
<IfVersion < 2.4>
337337
order allow,deny

‎.php_cs.dist

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
/**
8-
* Pre-commit hook installation:
9-
* vendor/bin/static-review.php hook:install dev/tools/Magento/Tools/StaticReview/pre-commit .git/hooks/pre-commit
10-
*/
117
$finder = PhpCsFixer\Finder::create()
128
->name('*.phtml')
139
->exclude('dev/tests/functional/generated')

0 commit comments

Comments
 (0)