NcamGnrvngu/gitlab-build-images
1
0
Fork 0
mirror of https://ops.gitlab.net/gitlab-org/gitlab-build-images.git synced 2025-12-08 17:42:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update license and contributing.md

Browse source 
Project is still MIT licensed, according to: gitlab-com/organization#146
This commit is contained in:
Zeger-Jan van de Weg 2017-11-14 14:57:23 +01:00
parent acf2ba5c1d
commit ea0ff96ca9
No known key found for this signature in database
GPG key ID: 65F6A8D64A88ABAC
3 changed files with 27 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
CONTRIBUTING.md Normal file
View file

@ -0,0 +1,12 @@
## Developer Certificate of Origin + License
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.
[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._

17
LICENSE
View file

@ -1,6 +1,6 @@
The MIT License (MIT) Copyright (c) 2011-2017 GitLab B.V.
Copyright (c) 2017 GitLab.org With regard to the GitLab Software:
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal
@ -9,13 +9,18 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions: furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all The above copyright notice and this permission notice shall be included in
copies or substantial portions of the Software. all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 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 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
SOFTWARE. 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.

4
README.md
View file

@ -71,3 +71,7 @@ process, but preserve them for reference within a comment in the `.gitlab-ci.yml
These images will persist in the docker repository for legacy use, but will no longer be recompiled. These images will persist in the docker repository for legacy use, but will no longer be recompiled.
If an update ever needs to be made to an image containing an older version of Chrome, a workaround If an update ever needs to be made to an image containing an older version of Chrome, a workaround
can be modeled after https://gitlab.com/gitlab-org/gitlab-build-images/merge_requests/54 can be modeled after https://gitlab.com/gitlab-org/gitlab-build-images/merge_requests/54
# Contributing
See [Contributing](CONTRIBUTING.md)