diff options
| author | Tiago <tiagonbotelho@hotmail.com> | 2017-12-13 13:43:17 +0300 |
|---|---|---|
| committer | LUKE BENNETT <lbennett@gitlab.com> | 2017-12-13 17:15:47 +0300 |
| commit | f9642476e646be96b38c9a0b8bc549959900e3cf (patch) | |
| tree | aa5a82af244a7e8ed4ca7628d84c85ea186bc72a /vendor/gitlab-ci-yml/CONTRIBUTING.md | |
| parent | c48ab6b2baac9ab1bd36e00396298e27c6f0332e (diff) | |
Merge branch '10-3-gitignore' into 'master'
10.3 gitignore and license templates
Closes #10
See merge request gitlab-org/gitlab-ce!15901
(cherry picked from commit 98eda47a52cab6fd250d25bb24d2457e43fa92d1)
f87f4250 Ran bin/rake gitlab:update_templates
Diffstat (limited to 'vendor/gitlab-ci-yml/CONTRIBUTING.md')
| -rw-r--r-- | vendor/gitlab-ci-yml/CONTRIBUTING.md | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/vendor/gitlab-ci-yml/CONTRIBUTING.md b/vendor/gitlab-ci-yml/CONTRIBUTING.md index d4c057bf9dc..d33a1f06f26 100644 --- a/vendor/gitlab-ci-yml/CONTRIBUTING.md +++ b/vendor/gitlab-ci-yml/CONTRIBUTING.md @@ -1,16 +1,15 @@ -## Contributing +## Developer Certificate of Origin + License -Thank you for your interest in contributing to this GitLab 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][individual-agreement]. - -By submitting code as an entity you agree to the [corporate contributor license -agreement][corporate-agreement]. +_This notice should stay as the first item in the CONTRIBUTING.md file._ ## Code of conduct |