You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: .github/PULL_REQUEST_TEMPLATE.md
+1-1Lines changed: 1 addition & 1 deletion
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -3,6 +3,6 @@
3
3
<!-- Please read https://matrix-org.github.io/dendrite/development/contributing before submitting your pull request -->
4
4
5
5
*[ ] I have added Go unit tests or [Complement integration tests](https://github.com/matrix-org/complement) for this PR _or_ I have justified why this PR doesn't need tests
6
-
*[ ] Pull request includes a [sign off below using a legally identifiable name](https://matrix-org.github.io/dendrite/development/contributing#sign-off)_or_ I have already signed off privately
6
+
*[ ] Pull request includes a [sign off below](https://element-hq.github.io/dendrite/development/contributing#sign-off)_or_ I have already signed off privately
Copy file name to clipboardExpand all lines: docs/development/CONTRIBUTING.md
+37-15Lines changed: 37 additions & 15 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -34,27 +34,49 @@ The following items are unlikely to be accepted into a main Dendrite release for
34
34
35
35
## Sign off
36
36
37
-
We require that everyone who contributes to the project signs off their contributions
38
-
in accordance with the [Developer Certificate of Origin](https://github.com/matrix-org/matrix-spec/blob/main/CONTRIBUTING.rst#sign-off).
39
-
In effect, this means adding a statement to your pull requests or commit messages
40
-
along the lines of:
37
+
We ask that everybody who contributes to this project signs off their contributions, as explained below.
38
+
39
+
We follow a simple 'inbound=outbound' model for contributions: the act of submitting an 'inbound' contribution means that the contributor agrees to license their contribution under the same terms as the project's overall 'outbound' license - in our case, this is Apache Software License v2 (see [LICENSE](../..//LICENSE)).
40
+
41
+
In order to have a concrete record that your contribution is intentional and you agree to license it under the same terms as the project's license, we've adopted the same lightweight approach used by the [Linux Kernel](https://www.kernel.org/doc/html/latest/process/submitting-patches.html), [Docker](https://github.com/docker/docker/blob/master/CONTRIBUTING.md), and many other projects: the [Developer Certificate of Origin](https://developercertificate.org/) (DCO). This is a simple declaration that you wrote the contribution or otherwise have the right to contribute it to Matrix:
41
42
42
43
```
43
-
Signed-off-by: Full Name <email address>
44
+
Developer Certificate of Origin
45
+
Version 1.1
46
+
Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
47
+
660 York Street, Suite 102,
48
+
San Francisco, CA 94110 USA
49
+
Everyone is permitted to copy and distribute verbatim copies of this
50
+
license document, but changing it is not allowed.
51
+
Developer's Certificate of Origin 1.1
52
+
By making a contribution to this project, I certify that:
53
+
(a) The contribution was created in whole or in part by me and I
54
+
have the right to submit it under the open source license
55
+
indicated in the file; or
56
+
(b) The contribution is based upon previous work that, to the best
57
+
of my knowledge, is covered under an appropriate open source
58
+
license and I have the right under that license to submit that
59
+
work with modifications, whether created in whole or in part
60
+
by me, under the same open source license (unless I am
61
+
permitted to submit under a different license), as indicated
62
+
in the file; or
63
+
(c) The contribution was provided directly to me by some other
64
+
person who certified (a), (b) or (c) and I have not modified
65
+
it.
66
+
(d) I understand and agree that this project and the contribution
67
+
are public and that a record of the contribution (including all
68
+
personal information I submit with it, including my sign-off) is
69
+
maintained indefinitely and may be redistributed consistent with
70
+
this project or the open source license(s) involved.
44
71
```
45
72
46
-
Unfortunately we can't accept contributions without a sign-off.
73
+
If you agree to this for your contribution, then all that's needed is to include the line in your commit or pull request comment:
47
74
48
-
Please note that we can only accept contributions under a legally identifiable name,
49
-
such as your name as it appears on government-issued documentation or common-law names
50
-
(claimed by legitimate usage or repute). We cannot accept sign-offs from a pseudonym or
If you would prefer to sign off privately instead (so as to not reveal your full
54
-
name on a public pull request), you can do so by emailing a sign-off declaration
55
-
and a link to your pull request directly to the [Matrix.org Foundation](https://matrix.org/foundation/)
56
-
at `[email protected]`. Once a private sign-off has been made, you will not be required
57
-
to do so for future contributions.
79
+
Git allows you to add this signoff automatically when using the `-s` flag to `git commit`, which uses the name and email set in your `user.name` and `user.email` git configs.
0 commit comments