Skip to content

Commit 67759ba

Browse files
committed
Merge pull request #1500 from rspec/update-common-markdown-files-2015-12-07-for-master
Updates from rspec-dev (2015-12-07)
2 parents e27a461 + da4c711 commit 67759ba

File tree

4 files changed

+40
-23
lines changed

4 files changed

+40
-23
lines changed

BUILD_DETAIL.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!---
2-
This file was generated on 2015-07-27T23:49:06-07:00 from the rspec-dev repo.
2+
This file was generated on 2015-12-07T22:01:06+11:00 from the rspec-dev repo.
33
DO NOT modify it by hand as your changes will get lost the next time it is generated.
44
-->
55

CODE_OF_CONDUCT.md

Lines changed: 36 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!---
2-
This file was generated on 2015-07-27T23:49:06-07:00 from the rspec-dev repo.
2+
This file was generated on 2015-12-07T22:01:06+11:00 from the rspec-dev repo.
33
DO NOT modify it by hand as your changes will get lost the next time it is generated.
44
-->
55

@@ -10,33 +10,50 @@ values contributions from anyone, the RSpec project has adopted the
1010
following code of conduct. All contributors and participants (including
1111
maintainers!) are expected to abide by its terms.
1212

13-
As contributors and maintainers of this project, we pledge to respect all
14-
people who contribute through reporting issues, posting feature requests,
15-
updating documentation, submitting pull requests or patches, and other
16-
activities.
13+
As contributors and maintainers of this project, and in the interest of
14+
fostering an open and welcoming community, we pledge to respect all people who
15+
contribute through reporting issues, posting feature requests, updating
16+
documentation, submitting pull requests or patches, and other activities.
1717

1818
We are committed to making participation in this project a harassment-free
1919
experience for everyone, regardless of level of experience, gender, gender
2020
identity and expression, sexual orientation, disability, personal appearance,
21-
body size, race, ethnicity, age, religion or similar personal characteristic.
21+
body size, race, ethnicity, age, religion, or nationality.
2222

23-
Examples of unacceptable behavior by participants include, but are not limited
24-
to, the use of sexual language or imagery, derogatory comments or personal
25-
attacks, trolling, public or private harassment, insults, or other
26-
unprofessional conduct.
23+
Examples of unacceptable behavior by participants include:
24+
25+
* The use of sexualized language or imagery
26+
* Personal attacks
27+
* Trolling or insulting/derogatory comments
28+
* Public or private harassment
29+
* Publishing other's private information, such as physical or electronic
30+
addresses, without explicit permission
31+
* Other unethical or unprofessional conduct
2732

2833
Project maintainers have the right and responsibility to remove, edit, or
2934
reject comments, commits, code, wiki edits, issues, and other contributions
30-
that are not aligned to this Code of Conduct. Project maintainers who do not
31-
follow the Code of Conduct may be removed from the project team.
35+
that are not aligned to this Code of Conduct, or to ban temporarily or
36+
permanently any contributor for other behaviors that they deem inappropriate,
37+
threatening, offensive, or harmful.
38+
39+
By adopting this Code of Conduct, project maintainers commit themselves to
40+
fairly and consistently applying these principles to every aspect of managing
41+
this project. Project maintainers who do not follow or enforce the Code of
42+
Conduct may be permanently removed from the project team.
3243

33-
This code of conduct applies both within project spaces and in public spaces
44+
This Code of Conduct applies both within project spaces and in public spaces
3445
when an individual is representing the project or its community.
3546

3647
Instances of abusive, harassing, or otherwise unacceptable behavior may be
37-
reported by opening an issue or contacting one or more of the project
38-
maintainers.
39-
40-
This Code of Conduct is adapted from the [Contributor
41-
Covenant](http://contributor-covenant.org), version 1.1.0, available at
42-
[http://contributor-covenant.org/version/1/1/0/](http://contributor-covenant.org/version/1/1/0/)
48+
reported by contacting one of the project maintainers listed at
49+
http://rspec.info/about/. All complaints will be reviewed and investigated
50+
and will result in a response that is deemed necessary and appropriate to the
51+
circumstances. Maintainers are obligated to maintain confidentiality with
52+
regard to the reporter of an incident.
53+
54+
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
55+
version 1.3.0, available at
56+
[http://contributor-covenant.org/version/1/3/0/][version]
57+
58+
[homepage]: http://contributor-covenant.org
59+
[version]: http://contributor-covenant.org/version/1/3/0/

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<!---
2-
This file was generated on 2015-07-27T23:49:06-07:00 from the rspec-dev repo.
2+
This file was generated on 2015-12-07T22:01:06+11:00 from the rspec-dev repo.
33
DO NOT modify it by hand as your changes will get lost the next time it is generated.
44
-->
55

66
# Contributing
77

8-
RSpec is a community-driven project that has benefited from improvements from over over *500* contributors.
8+
RSpec is a community-driven project that has benefited from improvements from over *500* contributors.
99
We welcome contributions from *everyone*. While contributing, please follow the project [code of conduct](CODE_OF_CONDUCT.md), so that everyone can be included.
1010

1111
If you'd like to help make RSpec better, here are some ways you can contribute:

DEVELOPMENT.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!---
2-
This file was generated on 2015-07-27T23:49:06-07:00 from the rspec-dev repo.
2+
This file was generated on 2015-12-07T22:01:06+11:00 from the rspec-dev repo.
33
DO NOT modify it by hand as your changes will get lost the next time it is generated.
44
-->
55

0 commit comments

Comments
 (0)