From 31eb273c90fca918ea3782765c06b16a38816db5 Mon Sep 17 00:00:00 2001 From: dosire Date: Tue, 11 Feb 2014 10:50:38 +0100 Subject: [PATCH 1/2] License change. --- LICENSE | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/LICENSE b/LICENSE index c3069180f9..391efd1089 100644 --- a/LICENSE +++ b/LICENSE @@ -2,15 +2,9 @@ The GitLab Enterprise Edition (EE) license Copyright (c) 2013 GitLab.com -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: +This software and associated documentation files (the "Software") can only be 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 and this permission notice shall be included in -all copies or substantial portions 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). Any part of this Software distributed as part of GitLab CE 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, From 4f3de79fe35f5ece3a16fcbe584a0cb7850ff9df Mon Sep 17 00:00:00 2001 From: dosire Date: Tue, 11 Feb 2014 11:07:43 +0100 Subject: [PATCH 2/2] Wrap license file. --- LICENSE | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/LICENSE b/LICENSE index 391efd1089..45999d6b2d 100644 --- a/LICENSE +++ b/LICENSE @@ -2,9 +2,16 @@ The GitLab Enterprise Edition (EE) license Copyright (c) 2013 GitLab.com -This software and associated documentation files (the "Software") can only be 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. +This software and associated documentation files (the "Software") can only be +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). Any part of this Software distributed as part of GitLab CE 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 notice applies only to the part of this Software that is +not distributed as part of GitLab Community Edition (CE). Any part of this +Software distributed as part of GitLab CE 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,