diff options
| -rw-r--r-- | CONTRIBUTING.md | 19 | ||||
| -rw-r--r-- | LICENSE | 16 | ||||
| -rw-r--r-- | README.md | 4 |
3 files changed, 23 insertions, 16 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e132d83b..442c2b00 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,13 +1,12 @@ -## Contributor license agreement +## Developer Certificate of Origin + License -By submitting code as an individual you agree to the [individual contributor -license agreement][individual-agreement]. +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. -By submitting code as an entity you agree to the [corporate contributor license -agreement][corporate-agreement]. - -For more information about the technicalities of contributing please see the [README](README.md). - -[individual-agreement]: https://docs.gitlab.com/ee/legal/individual_contributor_license_agreement.html -[corporate-agreement]: https://docs.gitlab.com/ee/legal/corporate_contributor_license_agreement.html +[DCO + License](https://gitlab.com/gitlab-org/dco/blob/master/README.md) +_This notice should stay as the first item in the CONTRIBUTING.md file._ @@ -1,6 +1,6 @@ -The MIT License (MIT) +Copyright (c) 2011-2017 GitLab B.V. -Copyright (c) 2016 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 @@ -9,13 +9,17 @@ 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 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. +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. @@ -11,6 +11,10 @@ Read more in [CONTRIBUTING.md](CONTRIBUTING.md). +## License + +See [LICENSE](LICENSE). + ## Development ### Requirements |