Skip to content

Commit

Permalink
Merge branch 'master' into 4-0-dev
Browse files Browse the repository at this point in the history
  • Loading branch information
JonRowe committed Oct 17, 2019
2 parents ca158fc + 33ab374 commit 1758815
Show file tree
Hide file tree
Showing 16 changed files with 114 additions and 109 deletions.
4 changes: 2 additions & 2 deletions BUILD_DETAIL.md
Expand Up @@ -68,8 +68,8 @@ $ bin/cucumber

## YARD documentation

RSpec uses [YARD](http://yardoc.org/) for API documentation on the [rspec.info site](http://rspec.info/).
Our commitment to [SemVer](htp://semver.org) requires that we explicitly
RSpec uses [YARD](https://yardoc.org/) for API documentation on the [rspec.info site](https://rspec.info/).
Our commitment to [SemVer](https://semver.org) requires that we explicitly
declare our public API, and our build uses YARD to ensure that every
class, module and method has either been labeled `@private` or has at
least some level of documentation. For new APIs, this forces us to make
Expand Down
8 changes: 4 additions & 4 deletions CODE_OF_CONDUCT.md
Expand Up @@ -46,14 +46,14 @@ when an individual is representing the project or its community.

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting one of the project maintainers listed at
http://rspec.info/about/. All complaints will be reviewed and investigated
https://rspec.info/about/. All complaints will be reviewed and investigated
and will result in a response that is deemed necessary and appropriate to the
circumstances. Maintainers are obligated to maintain confidentiality with
regard to the reporter of an incident.

This Code of Conduct is adapted from the [Contributor Covenant][homepage],
version 1.3.0, available at
[http://contributor-covenant.org/version/1/3/0/][version]
[https://contributor-covenant.org/version/1/3/0/][version]

[homepage]: http://contributor-covenant.org
[version]: http://contributor-covenant.org/version/1/3/0/
[homepage]: https://contributor-covenant.org
[version]: https://contributor-covenant.org/version/1/3/0/
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Expand Up @@ -13,8 +13,8 @@ If you'd like to help make RSpec better, here are some ways you can contribute:
- by running RSpec HEAD to help us catch bugs before new releases
- by [reporting bugs you encounter](https://github.com/rspec/rspec-rails/issues/new?template=bug_report.md)
- by [suggesting new features](https://github.com/rspec/rspec-rails/issues/new?template=feature_request.md)
- by improving RSpec's [Relish](https://relishapp.com/rspec) or [API](http://rspec.info/documentation/) documentation
- by improving [RSpec's website](http://rspec.info/) ([source](https://github.com/rspec/rspec.github.io))
- by improving RSpec's [Relish](https://relishapp.com/rspec) or [API](https://rspec.info/documentation/) documentation
- by improving [RSpec's website](https://rspec.info/) ([source](https://github.com/rspec/rspec.github.io))
- by taking part in [feature and issue discussions](https://github.com/rspec/rspec-rails/issues)
- by adding a failing test for reproducible [reported bugs](https://github.com/rspec/rspec-rails/issues)
- by reviewing [pull requests](https://github.com/rspec/rspec-rails/pulls) and suggesting improvements
Expand Down

0 comments on commit 1758815

Please sign in to comment.