diff options
| author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2017-11-14 16:48:37 +0300 |
|---|---|---|
| committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2017-11-21 14:02:59 +0300 |
| commit | ab8a43f5616faca228cc19469abadc348fdf0c33 (patch) | |
| tree | 634461965ba78a96e8de2ad811f2e7806d6f49e2 /CONTRIBUTING.md | |
| parent | 9783c5f7f0a2d7bf369d88d063ce548d0d707aa5 (diff) | |
Update license and contributing.md
Project is still MIT licensed, according to: gitlab-com/organization#146
Diffstat (limited to 'CONTRIBUTING.md')
| -rw-r--r-- | CONTRIBUTING.md | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 116c0c9cd..47d053181 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,16 +1,15 @@ -## Contributing +## Developer Certificate of Origin + License -Thank you for your interest in contributing to the Gitaly project! We welcome -all contributions. By participating in this project, you agree to abide by the -[code of conduct](#code-of-conduct). +By contributing to GitLab B.V., You accept and agree to the following terms and +conditions for Your present and future Contributions submitted to GitLab B.V. +Except for the license granted herein to GitLab B.V. and recipients of software +distributed by GitLab B.V., You reserve all right, title, and interest in and to +Your Contributions. All Contributions are subject to the following DCO + License +terms. -## Contributor license agreement +[DCO + License](https://gitlab.com/gitlab-org/dco/blob/master/README.md) -By submitting code as an individual you agree to the [individual contributor -license agreement](https://docs.gitlab.com/ee/legal/individual_contributor_license_agreement.html). - -By submitting code as an entity you agree to the [corporate contributor license -agreement](https://docs.gitlab.com/ee/legal/corporate_contributor_license_agreement.html). +_This notice should stay as the first item in the CONTRIBUTING.md file._ ## Code of conduct |