Unverified Commit e480788a authored by Marin Jankovski's avatar Marin Jankovski
Browse files

List licenses in the LICENSE file

Move different licensing content from README to LICENSE file
parent 901912d8
Copyright (c) 2011-present GitLab B.V.
 
Portions of this software under the "ee" directory are licensed as defined by
the "ee/LICENSE" file.
Portions of this software are licensed as follows:
* All content residing under the "doc/" directory of this repository is licensed under "Creative Commons: CC BY-SA 4.0 license".
* All content that resides under the "ee/" directory of this repository, if that directory exists, is licensed under the license defined in "ee/LICENSE".
* All client-side JavaScript (when served directly or after being compiled, arranged, augmented, or combined), is licensed under the "MIT Expat" license.
* All third party components incorporated into the GitLab Software are licensed under the original license provided by the owner of the applicable component.
* Content outside of the above mentioned directories or restrictions above is available under the "MIT Expat" license as defined below.
 
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
......
......@@ -37,15 +37,8 @@ There are two editions of GitLab:
 
## Licensing
 
GitLab Community Edition (CE) is available freely under the MIT Expat license.
All content that resides under the `ee/` directory of this repository (if it exists), is
part of GitLab Enterprise Edition (EE) and is licensed under the license defined
in `ee/LICENSE`.
All third party components incorporated into the GitLab Software are licensed under the original license provided by the owner of the applicable component.
All Documentation content that resides under the `doc/` directory of this repository is licensed under Creative Commons: CC BY-SA 4.0.
See the [LICENSE](LICENSE) file for licensing information as it pertains to
files in this repository.
 
## Hiring
 
......
......@@ -24,15 +24,12 @@ foregoing, it is forbidden to copy, merge, publish, distribute, sublicense,
and/or sell the Software.
 
This EE License applies only to the part of this Software that is not
distributed as part of GitLab Community Edition (CE), and that is not an image,
font, cascading stylesheet (CSS), or a file which is served as client-side
JavaScript, either directly or after having been compiled, arranged, augmented,
or combined into client-side JavaScript. Any part of this Software distributed
as part of GitLab CE or that is an image, font, cascading stylesheet (CSS), a
file which produces or is compiled, arranged, augmented, or combined into
client-side JavaScript, in whole or in part, is copyrighted under the MIT Expat
license. The full text of this EE License shall be included in all copies or
substantial portions of the Software.
distributed as part of GitLab Community Edition (CE). Any part of this Software
distributed as part of GitLab CE or is served client-side as an image, font,
cascading stylesheet (CSS), file which produces or is compiled, arranged,
augmented, or combined into client-side JavaScript, in whole or in part, is
copyrighted under the MIT Expat license. The full text of this EE License 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,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment