summaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authorAndrea Kao <eirinikos@gmail.com>2018-05-15 15:04:48 -0700
committerAndrea Kao <eirinikos@gmail.com>2018-05-15 15:04:48 -0700
commite943c45800e1af56919b551b72224489e81bcd85 (patch)
tree28256aff6e6f13391cab7ce03597ff7f1fece8eb /LICENSE
parent64fe244d40ca44fb0433af78a474cfe4cfec33d7 (diff)
downloadgitlab-ce-e943c45800e1af56919b551b72224489e81bcd85.tar.gz
edit GitLab license info in regards to CC licensing
GitHub uses a library called Licensee to identify a project's license type. It shows this information in the status bar and via the API if it can unambiguously identify the license. This commit moves the reference to Creative Commons licensing from the LICENSE file to the README, which allows Licensee to successfully identify the license type of GitLab CE as MIT. Signed-off-by: Andrea Kao <eirinikos@gmail.com>
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE7
1 files changed, 1 insertions, 6 deletions
diff --git a/LICENSE b/LICENSE
index a42e07dfe91..a76372fad2c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -4,9 +4,4 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of
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.
-
----
-
-All Documentation content that resides under the doc/ directory of this
-repository is licensed under Creative Commons: CC BY-SA 4.0.
+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. \ No newline at end of file