summaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authorMarin Jankovski <maxlazio@gmail.com>2019-06-17 12:41:28 +0200
committerMarin Jankovski <maxlazio@gmail.com>2019-08-13 15:12:34 +0200
commit736485df5c73bf306d629c71d350e12eebaeb1cd (patch)
tree2394325aadb4c1f34660d98d42d8b110e4bcbc24 /LICENSE
parentc85cbc08f7fc43819f7569b7686ee22ce747e7b3 (diff)
downloadgitlab-ce-736485df5c73bf306d629c71d350e12eebaeb1cd.tar.gz
List licenses in the LICENSE filemj/license-updates
Move different licensing content from README to LICENSE file
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE10
1 files changed, 9 insertions, 1 deletions
diff --git a/LICENSE b/LICENSE
index a90ea939517..216125d93c7 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,12 @@
-Copyright GitLab B.V.
+Copyright (c) 2011-present GitLab B.V.
+
+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