From 5b51ef7bdd50e4171e7bdd82e242ac3da35156f7 Mon Sep 17 00:00:00 2001 From: Marc Radulescu Date: Fri, 26 Dec 2014 18:14:23 +0100 Subject: [PATCH 1/3] add EE features list and useful links to readme file in gitlab --- README.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/README.md b/README.md index afcaaf0f0f..07b1087543 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,18 @@ - Completely free and open source (MIT Expat license) - Powered by Ruby on Rails +## Additional features availabe in GitLab Enterprise Edition + +You might be interested in some of the features we include in GitLab Enterprise Edition: + - Deeper LDAP integration, specifically L[DAP group synchronization](http://doc.gitlab.com/ee/integration/ldap.html#ldap-group-synchronization-gitlab-enterprise-edition), sharing a project with other groups, and [multiple LDAP support](http://doc.gitlab.com/ee/integration/ldap.html#integrate-gitlab-with-more-than-one-ldap-server-enterprise-edition); + - Manage contributions to your code with [git hooks](http://doc.gitlab.com/ee/git_hooks/git_hooks.html), [rebasing merge requests](http://doc.gitlab.com/ee/workflow/gitlab_flow.html#do-not-order-commits-with-rebase), and [auditing](http://doc.gitlab.com/ee/administration/audit_events.html); + - [Deeper Jenkins CI integration](http://doc.gitlab.com/ee/integration/jenkins.html); + - [Deeper JIRA integration](http://doc.gitlab.com/ee/integration/jira.html) + +GitLab Enterprise Edition is available to our subscribers, along with support from our side. [How to become a subscriber.](https://about.gitlab.com/pricing/) + +Feel free to check out the rest of the features in GitLab Enterprise Edition [here](https://about.gitlab.com/features/#enterprise) + ## Canonical source - The source of GitLab Community Edition is [hosted on GitLab.com](https://gitlab.com/gitlab-org/gitlab-ce/) and there are mirrors to make [contributing](CONTRIBUTING.md) as easy as possible. From ce6b0519ccddff2476d2255df49b39ccdb07013e Mon Sep 17 00:00:00 2001 From: Marc Radulescu Date: Mon, 12 Jan 2015 16:47:39 +0100 Subject: [PATCH 2/3] remove duplication by linking EE features directly to website --- README.md | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 07b1087543..ae368ed83e 100644 --- a/README.md +++ b/README.md @@ -11,18 +11,15 @@ - Completely free and open source (MIT Expat license) - Powered by Ruby on Rails -## Additional features availabe in GitLab Enterprise Edition +## Editions -You might be interested in some of the features we include in GitLab Enterprise Edition: - - Deeper LDAP integration, specifically L[DAP group synchronization](http://doc.gitlab.com/ee/integration/ldap.html#ldap-group-synchronization-gitlab-enterprise-edition), sharing a project with other groups, and [multiple LDAP support](http://doc.gitlab.com/ee/integration/ldap.html#integrate-gitlab-with-more-than-one-ldap-server-enterprise-edition); - - Manage contributions to your code with [git hooks](http://doc.gitlab.com/ee/git_hooks/git_hooks.html), [rebasing merge requests](http://doc.gitlab.com/ee/workflow/gitlab_flow.html#do-not-order-commits-with-rebase), and [auditing](http://doc.gitlab.com/ee/administration/audit_events.html); - - [Deeper Jenkins CI integration](http://doc.gitlab.com/ee/integration/jenkins.html); - - [Deeper JIRA integration](http://doc.gitlab.com/ee/integration/jira.html) +There are two editions available for GitLab. +GitLab Community Edition is aimed at individuals and small teams. Click [here](https://about.gitlab.com/features/) for an overview of its major features. + +GitLab Enterprise Edition is designed to accommodate big teams and organizations. You can find out more about the additional features [here](https://about.gitlab.com/features/#compare) GitLab Enterprise Edition is available to our subscribers, along with support from our side. [How to become a subscriber.](https://about.gitlab.com/pricing/) -Feel free to check out the rest of the features in GitLab Enterprise Edition [here](https://about.gitlab.com/features/#enterprise) - ## Canonical source - The source of GitLab Community Edition is [hosted on GitLab.com](https://gitlab.com/gitlab-org/gitlab-ce/) and there are mirrors to make [contributing](CONTRIBUTING.md) as easy as possible. From 1cdce0f1828edd806f66999f84de404f24c77dc0 Mon Sep 17 00:00:00 2001 From: Marc Radulescu Date: Tue, 13 Jan 2015 15:47:35 +0100 Subject: [PATCH 3/3] revise wording to clarify CE and EE definitions --- README.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index ae368ed83e..a0cf381dd0 100644 --- a/README.md +++ b/README.md @@ -15,10 +15,14 @@ There are two editions available for GitLab. -GitLab Community Edition is aimed at individuals and small teams. Click [here](https://about.gitlab.com/features/) for an overview of its major features. +GitLab Community Edition is an open source code collaboration platform. +Click [here](https://about.gitlab.com/features/) for an overview of its major features. -GitLab Enterprise Edition is designed to accommodate big teams and organizations. You can find out more about the additional features [here](https://about.gitlab.com/features/#compare) -GitLab Enterprise Edition is available to our subscribers, along with support from our side. [How to become a subscriber.](https://about.gitlab.com/pricing/) +GitLab Enterprise Edition includes features useful for organizations with over 100 users. +You can read about these features [here](https://about.gitlab.com/features/#compare) + +GitLab Enterprise Edition is available to GitLab subscribers, along with support from the GitLab B.V. service engineers. +[How to become a subscriber.](https://about.gitlab.com/pricing/) ## Canonical source