From 9c1e1764fbff3632d7f09fdd5022770ce124ef28 Mon Sep 17 00:00:00 2001 From: Alessio Caiazza <acaiazza@gitlab.com> Date: Wed, 15 Nov 2017 13:28:04 +0100 Subject: [PATCH] Replace CLA with DCO + License --- CONTRIBUTING.md | 22 +++++++++------------- NOTICE | 25 +++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 13 deletions(-) create mode 100644 NOTICE diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 55baa242..442c2b00 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,16 +1,12 @@ -## Contributing to GitLab Runner +## Developer Certificate of Origin + License -Contributions are welcome! +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. -The official repository for this project is on [GitLab.com](https://gitlab.com/gitlab-org/gitlab-runner). +[DCO + License](https://gitlab.com/gitlab-org/dco/blob/master/README.md) -* [Development](docs/development/README.md) -* [Issues](https://gitlab.com/gitlab-org/gitlab-runner/issues) -* [Merge Requests](https://gitlab.com/gitlab-org/gitlab-runner/merge_requests) - -## Contributor license agreement - -By submitting code as an individual you agree to the -[individual contributor license agreement](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/legal/individual_contributor_license_agreement.md). -By submitting code as an entity you agree to the -[corporate contributor license agreement](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/legal/corporate_contributor_license_agreement.md). +_This notice should stay as the first item in the CONTRIBUTING.md file._ diff --git a/NOTICE b/NOTICE new file mode 100644 index 00000000..8a1a7fa7 --- /dev/null +++ b/NOTICE @@ -0,0 +1,25 @@ +Copyright (c) 2015-2017 GitLab B.V. + +With regard to the GitLab Software: + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. + +For all third party components incorporated into the GitLab Software, those +components are licensed under the original license provided by the owner of the +applicable component. -- GitLab