Skip to content

Commit dd8f4ec

Browse files
committed
Merge branch 'master' into 4-0-dev
2 parents ca158fc + 33ab374 commit dd8f4ec

19 files changed

+119
-188
lines changed

BUILD_DETAIL.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ $ bin/cucumber
6868

6969
## YARD documentation
7070

71-
RSpec uses [YARD](http://yardoc.org/) for API documentation on the [rspec.info site](http://rspec.info/).
72-
Our commitment to [SemVer](htp://semver.org) requires that we explicitly
71+
RSpec uses [YARD](https://yardoc.org/) for API documentation on the [rspec.info site](https://rspec.info/).
72+
Our commitment to [SemVer](https://semver.org) requires that we explicitly
7373
declare our public API, and our build uses YARD to ensure that every
7474
class, module and method has either been labeled `@private` or has at
7575
least some level of documentation. For new APIs, this forces us to make

CODE_OF_CONDUCT.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,14 @@ when an individual is representing the project or its community.
4646

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

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

58-
[homepage]: http://contributor-covenant.org
59-
[version]: http://contributor-covenant.org/version/1/3/0/
58+
[homepage]: https://contributor-covenant.org
59+
[version]: https://contributor-covenant.org/version/1/3/0/

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ If you'd like to help make RSpec better, here are some ways you can contribute:
1313
- by running RSpec HEAD to help us catch bugs before new releases
1414
- by [reporting bugs you encounter](https://github.com/rspec/rspec-rails/issues/new?template=bug_report.md)
1515
- by [suggesting new features](https://github.com/rspec/rspec-rails/issues/new?template=feature_request.md)
16-
- by improving RSpec's [Relish](https://relishapp.com/rspec) or [API](http://rspec.info/documentation/) documentation
17-
- by improving [RSpec's website](http://rspec.info/) ([source](https://github.com/rspec/rspec.github.io))
16+
- by improving RSpec's [Relish](https://relishapp.com/rspec) or [API](https://rspec.info/documentation/) documentation
17+
- by improving [RSpec's website](https://rspec.info/) ([source](https://github.com/rspec/rspec.github.io))
1818
- by taking part in [feature and issue discussions](https://github.com/rspec/rspec-rails/issues)
1919
- by adding a failing test for reproducible [reported bugs](https://github.com/rspec/rspec-rails/issues)
2020
- by reviewing [pull requests](https://github.com/rspec/rspec-rails/pulls) and suggesting improvements

0 commit comments

Comments
 (0)