Skip to content

Commit efb724b

Browse files
committed
Remove the DCO requirement for commits
Signed-off-by: James Couball <jcouball@yahoo.com>
1 parent d6543aa commit efb724b

File tree

2 files changed

+29
-74
lines changed

2 files changed

+29
-74
lines changed

.github/pull_request_template.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
### Your checklist for this pull request
2-
🚨Please review the [guidelines for contributing](https://github.com/ruby-git/ruby-git/blob/master/CONTRIBUTING.md) to this repository.
1+
[Guidelines for contributing](https://github.com/ruby-git/ruby-git/blob/master/CONTRIBUTING.md) to this repository
32

4-
- [ ] Ensure all commits include DCO sign-off.
5-
- [ ] Ensure that your contributions pass unit testing.
6-
- [ ] Ensure that your contributions contain documentation if applicable.
3+
A good start is to:
4+
5+
* Ensure that your changes pass CI tests by running `rake` before pushing
6+
* Ensure that your changes are documented in the README.md and in YARD documentation
7+
8+
# Description
79

8-
### Description
9-
Please describe your pull request.

CONTRIBUTING.md

Lines changed: 22 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,6 @@ There is three step process for code or documentation changes:
4040

4141
Make your changes in a fork of the ruby-git repository.
4242

43-
Each commit must include a [DCO sign-off](#developer-certificate-of-origin-dco)
44-
by adding the line `Signed-off-by: Name <email>` to the end of the commit
45-
message.
46-
4743
### Create a pull request
4844

4945
See [this article](https://help.github.com/articles/about-pull-requests/) if you
@@ -71,15 +67,18 @@ request meets [the project's coding standards](#coding-standards).
7167
In order to ensure high quality, all pull requests must meet these requirements:
7268

7369
### 1 PR = 1 Commit
74-
* All commits for a PR must be squashed into one commit
75-
* To avoid an extra merge commit, the PR must be able to be merged as [a fast forward merge](https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging)
76-
* The easiest way to ensure a fast forward merge is to rebase your local branch
77-
to the ruby-git master branch
70+
71+
* All commits for a PR must be squashed into one commit
72+
* To avoid an extra merge commit, the PR must be able to be merged as [a fast forward
73+
merge](https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging)
74+
* The easiest way to ensure a fast forward merge is to rebase your local branch to
75+
the ruby-git master branch
7876

7977
### Unit tests
80-
* All changes must be accompanied by new or modified unit tests
81-
* The entire test suite must pass when `bundle exec rake default` is run from the
82-
project's local working copy.
78+
79+
* All changes must be accompanied by new or modified unit tests
80+
* The entire test suite must pass when `bundle exec rake default` is run from the
81+
project's local working copy.
8382

8483
While working on specific features you can run individual test files or
8584
a group of tests using `bin/test`:
@@ -94,20 +93,21 @@ a group of tests using `bin/test`:
9493
$ bin/test
9594

9695
### Continuous integration
97-
* All tests must pass in the project's [GitHub Continuous Integration build](https://github.com/ruby-git/ruby-git/actions?query=workflow%3ACI)
98-
before the pull request will be merged.
99-
* The [Continuous Integration workflow](https://github.com/ruby-git/ruby-git/blob/master/.github/workflows/continuous_integration.yml)
100-
runs both `bundle exec rake default` and `bundle exec rake test:gem` from the project's [Rakefile](https://github.com/ruby-git/ruby-git/blob/master/Rakefile).
96+
97+
* All tests must pass in the project's [GitHub Continuous Integration
98+
build](https://github.com/ruby-git/ruby-git/actions?query=workflow%3ACI) before the
99+
pull request will be merged.
100+
* The [Continuous Integration
101+
workflow](https://github.com/ruby-git/ruby-git/blob/master/.github/workflows/continuous_integration.yml)
102+
runs both `bundle exec rake default` and `bundle exec rake test:gem` from the
103+
project's [Rakefile](https://github.com/ruby-git/ruby-git/blob/master/Rakefile).
101104

102105
### Documentation
103-
* New and updated public methods must have [YARD](https://yardoc.org/)
104-
documentation added to them
105-
* New and updated public facing features should be documented in the project's
106-
[README.md](README.md)
107106

108-
### Licensing sign-off
109-
* Each commit must contain [the DCO sign-off](#developer-certificate-of-origin-dco)
110-
in the form: `Signed-off-by: Name <email>`
107+
* New and updated public methods must have [YARD](https://yardoc.org/) documentation
108+
added to them
109+
* New and updated public facing features should be documented in the project's
110+
[README.md](README.md)
111111

112112
## Licensing
113113

@@ -116,48 +116,3 @@ declared in the [LICENSE](LICENSE) file.
116116

117117
Licensing is very important to open source projects. It helps ensure the
118118
software continues to be available under the terms that the author desired.
119-
120-
### Developer Certificate of Origin (DCO)
121-
122-
This project requires that authors have permission to submit their contributions
123-
under the MIT license. To make a good faith effort to ensure this, ruby-git
124-
requires the [Developer Certificate of Origin (DCO)](https://elinux.org/Developer_Certificate_Of_Origin)
125-
process be followed.
126-
127-
This process requires that each commit include a `Signed-off-by` line that
128-
indicates the author accepts the DCO. Here is an example DCO sign-off line:
129-
130-
```
131-
Signed-off-by: John Doe <john.doe@hisdomain.com>
132-
```
133-
134-
The full text of the DCO version 1.1 is below or at <http://developercertificate.org/>.
135-
136-
```
137-
Developer's Certificate of Origin 1.1
138-
139-
By making a contribution to this project, I certify that:
140-
141-
(a) The contribution was created in whole or in part by me and I
142-
have the right to submit it under the open source license
143-
indicated in the file; or
144-
145-
(b) The contribution is based upon previous work that, to the
146-
best of my knowledge, is covered under an appropriate open
147-
source license and I have the right under that license to
148-
submit that work with modifications, whether created in whole
149-
or in part by me, under the same open source license (unless
150-
I am permitted to submit under a different license), as
151-
Indicated in the file; or
152-
153-
(c) The contribution was provided directly to me by some other
154-
person who certified (a), (b) or (c) and I have not modified
155-
it.
156-
157-
(d) I understand and agree that this project and the contribution
158-
are public and that a record of the contribution (including
159-
all personal information I submit with it, including my
160-
sign-off) is maintained indefinitely and may be redistributed
161-
consistent with this project or the open source license(s)
162-
involved.
163-
```

0 commit comments

Comments
 (0)