Skip to content
This repository was archived by the owner on Nov 30, 2024. It is now read-only.

Commit 2a52c65

Browse files
committed
Merge pull request #2818 from rspec/update-common-plaintext-files-2020-12-25-for-main
Updates from rspec-dev (2020-12-25)
1 parent 7bfbd37 commit 2a52c65

File tree

6 files changed

+14
-15
lines changed

6 files changed

+14
-15
lines changed

.github/FUNDING.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2020-12-24T13:24:00+01:00 from the rspec-dev repo.
1+
# This file was generated on 2020-12-25T18:48:30+00:00 from the rspec-dev repo.
22
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
33

44
github: [JonRowe, benoittgt]

BUILD_DETAIL.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!---
2-
This file was generated on 2020-12-24T13:24:00+01:00 from the rspec-dev repo.
2+
This file was generated on 2020-12-25T18:48:30+00: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

@@ -97,10 +97,11 @@ $ bundle exec yard doc --no-cache
9797
$ bin/yard doc --no-cache
9898
```
9999

100-
## Rubocop
100+
## RuboCop
101101

102-
We use [Rubocop](https://github.com/bbatsov/rubocop) to enforce style conventions on the project so
103-
that the code has stylistic consistency throughout. Run with:
102+
We use [RuboCop](https://github.com/rubocop-hq/rubocop) to enforce style
103+
conventions on the project so that the code has stylistic consistency
104+
throughout. Run with:
104105

105106
```
106107
$ bundle exec rubocop lib
@@ -110,9 +111,9 @@ $ bundle exec rubocop lib
110111
$ bin/rubocop lib
111112
```
112113

113-
Our Rubocop configuration is a work-in-progress, so if you get a failure
114-
due to a Rubocop default, feel free to ask about changing the
115-
configuration. Otherwise, you'll need to address the Rubocop failure,
114+
Our RuboCop configuration is a work-in-progress, so if you get a failure
115+
due to a RuboCop default, feel free to ask about changing the
116+
configuration. Otherwise, you'll need to address the RuboCop failure,
116117
or, as a measure of last resort, by wrapping the offending code in
117118
comments like `# rubocop:disable SomeCheck` and `# rubocop:enable SomeCheck`.
118119

@@ -146,4 +147,3 @@ build for another repo, so our CI build includes a spec that runs the
146147
spec suite of each of the _other_ project repos. Note that we only run
147148
the spec suite, not the full build, of the other projects, as the spec
148149
suite runs very quickly compared to the full build.
149-

CODE_OF_CONDUCT.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 2020-12-24T13:24:00+01:00 from the rspec-dev repo.
2+
This file was generated on 2020-12-25T18:48:30+00: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

CONTRIBUTING.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 2020-12-24T13:24:00+01:00 from the rspec-dev repo.
2+
This file was generated on 2020-12-25T18:48:30+00: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

DEVELOPMENT.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!---
2-
This file was generated on 2020-12-24T13:24:00+01:00 from the rspec-dev repo.
2+
This file was generated on 2020-12-25T18:48:30+00: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

@@ -108,7 +108,7 @@ Here's a short, non-exhaustive checklist of things we typically ask contributors
108108
- [ ] New behavior is covered by tests and all tests are passing.
109109
- [ ] No Ruby warnings are issued by your changes.
110110
- [ ] Documentation reflects changes and renders as intended.
111-
- [ ] Rubocop passes (e.g. `bundle exec rubocop lib`).
111+
- [ ] RuboCop passes (e.g. `bundle exec rubocop lib`).
112112
- [ ] Commits are squashed into a reasonable number of logical changesets that tell an easy-to-follow story.
113113
- [ ] No changelog entry is necessary (we'll add it as part of the merge process!)
114114

@@ -129,4 +129,3 @@ $ bin/yard server --reload
129129
```
130130

131131
Then navigate to `localhost:8808` to view the rendered docs.
132-

REPORT_TEMPLATE.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 2020-12-24T13:24:00+01:00 from the rspec-dev repo.
2+
This file was generated on 2020-12-25T18:48:30+00: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)