From 044036e49864188711f73c47404d439edfca5c49 Mon Sep 17 00:00:00 2001 From: Sytse Sijbrandij Date: Sun, 26 Apr 2015 23:22:15 +0000 Subject: [PATCH] Implement the suggestions of Mike: The "in whole or in part" is important mostly because it removes ambiguity, but also because there may be code that is responsible for the generation of the JavaScript/CoffeeScript code. If a file generates non-trivial JavaScript, then that JavaScript code must be free; but it can't be free in and of itself, because it does not appear in the source code. You can otherwise: --- LICENSE | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/LICENSE b/LICENSE index 64c05ddb9b..af17e82a2f 100644 --- a/LICENSE +++ b/LICENSE @@ -6,12 +6,13 @@ used with a valid GitLab subscription for the correct number of users. You are free to modify this Software and publish patches. It is forbidden to copy, merge, publish, distribute, sublicense, and/or sell copies of the Software. -The above copyright notice applies only to the part of this Software that is -not distributed as part of GitLab Community Edition (CE) and that is not -client side javascript. Any part of this Software distributed as part of -GitLab CE or that is client side javascript is copyrighted under the MIT Expat -license. The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. +The above copyright notices applies only to the part of this Software that is +not distributed as part of GitLab Community Edition (CE), and that is not a +file that produces client-side JavaScript, in whole or in part. Any part of +this Software distributed as part of GitLab CE or that is not a file that +produces client-side JavaScript, in whole or in part, is copyrighted under the +MIT Expat license. 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,