Skip to content

Commit 91af47d

Browse files
authored
Merge pull request #774 from magento/MQE-2231-master
[master] MQE-2231: Adobe open source repository standards compliance
2 parents f140fb5 + e3b5ca2 commit 91af47d

File tree

3 files changed

+89
-7
lines changed

3 files changed

+89
-7
lines changed

.github/CONTRIBUTING.md

+10-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,16 @@ If there is no response from the contributor for two weeks, the issue is closed.
2424
Often when the MFTF team works on reviewing the suggested changes, we will add a label to the issue to indicate to our internal team certain information, like status or who is working the issue.
2525
If you’re ever curious what the different labels mean, see the [table][labels] below for an explanation of each one.
2626

27-
Refer to [Magento Contributor Agreement] for detailed information about the License Agreement.
28-
All contributors are required to submit a click-through form to agree to the terms.
27+
## Code Of Conduct
28+
29+
This project adheres to the Adobe [Code Of Conduct](../CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code.
30+
Please report unacceptable behavior to [Grp-opensourceoffice@adobe.com](mailto:Grp-opensourceoffice@adobe.com).
31+
32+
## Contributor License Agreement
33+
34+
All third-party contributions to this project must be accompanied by a signed Contributor License Agreement (CLA).
35+
This gives Adobe permission to redistribute your contributions as part of the project.
36+
[Sign our CLA](https://opensource.adobe.com/cla.html). You only need to sign it once.
2937

3038
## Contribution requirements
3139

CODE_OF_CONDUCT.md

+74
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
# Adobe Code of Conduct
2+
3+
## Our Pledge
4+
5+
In the interest of fostering an open and welcoming environment, we as
6+
contributors and maintainers pledge to making participation in our project and
7+
our community a harassment-free experience for everyone, regardless of age, body
8+
size, disability, ethnicity, gender identity and expression, level of experience,
9+
nationality, personal appearance, race, religion, or sexual identity and
10+
orientation.
11+
12+
## Our Standards
13+
14+
Examples of behavior that contributes to creating a positive environment
15+
include:
16+
17+
* Using welcoming and inclusive language.
18+
* Being respectful of differing viewpoints and experiences.
19+
* Gracefully accepting constructive criticism.
20+
* Focusing on what is best for the community.
21+
* Showing empathy towards other community members.
22+
23+
Examples of unacceptable behavior by participants include:
24+
25+
* The use of sexualized language or imagery and unwelcome sexual attention or
26+
advances.
27+
* Trolling, insulting/derogatory comments, and personal or political attacks.
28+
* Public or private harassment.
29+
* Publishing others' private information, such as a physical or electronic
30+
address, without explicit permission.
31+
* Other conduct which could reasonably be considered inappropriate in a
32+
professional setting.
33+
34+
## Our Responsibilities
35+
36+
Project maintainers are responsible for clarifying the standards of acceptable
37+
behavior and are expected to take appropriate and fair corrective action in
38+
response to any instances of unacceptable behavior.
39+
40+
Project maintainers have the right and responsibility to remove, edit, or
41+
reject comments, commits, code, wiki edits, issues, and other contributions
42+
that are not aligned to this Code of Conduct, or to ban temporarily or
43+
permanently any contributor for other behaviors that they deem inappropriate,
44+
threatening, offensive, or harmful.
45+
46+
## Scope
47+
48+
This Code of Conduct applies both within project spaces and in public spaces
49+
when an individual is representing the project or its community. Examples of
50+
representing a project or community include using an official project e-mail
51+
address, posting via an official social media account, or acting as an appointed
52+
representative at an online or offline event. Representation of a project may be
53+
further defined and clarified by project maintainers.
54+
55+
## Enforcement
56+
57+
Instances of abusive, harassing, or otherwise unacceptable behavior may be
58+
reported by contacting the project team at Grp-opensourceoffice@adobe.com. All
59+
complaints will be reviewed and investigated and will result in a response that
60+
is deemed necessary and appropriate to the circumstances. The project team is
61+
obligated to maintain confidentiality with regard to the reporter of an incident.
62+
Further details of specific enforcement policies may be posted separately.
63+
64+
Project maintainers who do not follow or enforce the Code of Conduct in good
65+
faith may face temporary or permanent repercussions as determined by other
66+
members of the project's leadership.
67+
68+
## Attribution
69+
70+
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
71+
available at [https://contributor-covenant.org/version/1/4][version].
72+
73+
[homepage]: https://contributor-covenant.org
74+
[version]: https://contributor-covenant.org/version/1/4/

README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -58,23 +58,23 @@ These labels are applied by the MFTF development team to community contributed i
5858
To report security vulnerabilities and other security issues in the Magento software or web sites, send an email with the report at [security@magento.com][].
5959
Do not report security issues using GitHub.
6060
Be sure to encrypt your e-mail with our [encryption key][] if it includes sensitive information.
61-
Learn more about reporting security issues [here][].
61+
Learn more about reporting [security][] issues.
6262

6363
Stay up-to-date on the latest security news and patches for Magento by signing up for [Security Alert Notifications][].
6464

6565
## License
6666

6767
Each Magento source file included in this distribution is licensed under AGPL 3.0.
6868

69-
See the license [here][] or contact [license@magentocommerce.com][] for a copy.
69+
See the [license][] or contact [license@magentocommerce.com][] for a copy.
7070

7171
<!-- Link Definitions -->
7272
[Getting Started]: docs/getting-started.md
73-
[Contribution Guidelines]: https://github.com/magento/magento2-functional-testing-framework/blob/develop/.github/CONTRIBUTING.md
73+
[Contribution Guidelines]: .github/CONTRIBUTING.md
7474
[DevDocs Contributing]: https://github.com/magento/devdocs/blob/master/.github/CONTRIBUTING.md
7575
[security@magento.com]: mailto:security@magento.com
7676
[encryption key]: https://info2.magento.com/rs/magentoenterprise/images/security_at_magento.asc
77-
[here]: https://magento.com/security/reporting-magento-security-issue
77+
[security]: https://magento.com/security/reporting-magento-security-issue
7878
[Security Alert Notifications]: https://magento.com/security/sign-up
79-
[here]: LICENSE_AGPL3.txt
79+
[license]: LICENSE_AGPL3.txt
8080
[license@magentocommerce.com]: mailto:license@magentocommerce.com

0 commit comments

Comments
 (0)