There are two editions of GitLab: [Enterprise Edition](https://about.gitlab.com/products/)(EE) and [Community Edition](https://about.gitlab.com/gitlab-ce/)(CE). GitLab CE is delivered via git from the [gitlabhq repository](https://gitlab.com/gitlab-org/gitlab-ce/tree/master). New versions of GitLab are released in stable branches and the master branch is for bleeding edge development.
There are two editions of GitLab: [Enterprise Edition](https://about.gitlab.com/gitlab-ee/)(EE) and [Community Edition](https://about.gitlab.com/gitlab-ce/)(CE). GitLab CE is delivered via git from the [gitlabhq repository](https://gitlab.com/gitlab-org/gitlab-ce/tree/master). New versions of GitLab are released in stable branches and the master branch is for bleeding edge development.
EE releases are available not long after CE releases. To obtain GitLab EE there is a [repository at gitlab.com](https://gitlab.com/gitlab-org/gitlab-ee). For more information about the release process see the section 'New versions and upgrading' in the readme.
EE releases are available not long after CE releases. To obtain GitLab EE there is a [repository at gitlab.com](https://gitlab.com/gitlab-org/gitlab-ee). For more information about the release process see the section 'New versions and upgrading' in the readme.
@@ -21,7 +21,7 @@ and click a button to begin the upgrade process.
...
@@ -21,7 +21,7 @@ and click a button to begin the upgrade process.
## Features
## Features
The GitLab Pivotal Tile is based on [Premium] and includes nearly all of its features. The features in Premium but _not_ supported on the Tile are:
The GitLab Pivotal Tile is based on [GitLab Premium] and includes nearly all of its features. The features in Premium but _not_ supported on the Tile are:
@@ -279,12 +279,8 @@ Auto Browser Performance Testing utilizes the [Sitespeed.io container](https://h
...
@@ -279,12 +279,8 @@ Auto Browser Performance Testing utilizes the [Sitespeed.io container](https://h
/direction
/direction
```
```
<<<<<<< HEAD
In GitLab Premium, performance differences between the source
In GitLab Premium, performance differences between the source
and target branches are [shown in the merge request widget](../../user/project/merge_requests/browser_performance_testing.md).
and target branches are [shown in the merge request widget](../../user/project/merge_requests/browser_performance_testing.md).
=======
In GitLab Premium, performance differences between the source and target branches are [shown in the merge request widget](https://docs.gitlab.com/ee/user/project/merge_requests/browser_performance_testing.html).
>>>>>>> bfab3990f8c... search and replace "Premium" => "Premium"
> Available in [GitLab Premium](https://about.gitlab.com/products/).
> Available in [GitLab Premium](https://about.gitlab.com/products/) and [GitLab.com Silver](https://about.gitlab.com/gitlab-com/).
The user that locks a file or directory is the only one that can edit and push their changes back to the repository where the locked objects are located.
The user that locks a file or directory is the only one that can edit and push their changes back to the repository where the locked objects are located.
Read through the documentation on [permissions for File Locking](https://docs.gitlab.com/ee/user/project/file_lock.html#permissions-on-file-locking) to learn more.
Read through the documentation on [permissions for File Locking](https://docs.gitlab.com/ee/user/project/file_lock.html#permissions-on-file-locking) to learn more.
@@ -288,7 +288,7 @@ Read through the documentation on [LDAP users permissions](../administration/aut
...
@@ -288,7 +288,7 @@ Read through the documentation on [LDAP users permissions](../administration/aut
An Auditor user should be able to access all projects and groups of a GitLab instance
An Auditor user should be able to access all projects and groups of a GitLab instance
with the permissions described on the documentation on [auditor users permissions](https://docs.gitlab.com/ee/administration/auditor_users.html#permissions-and-restrictions-of-an-auditor-user).
with the permissions described on the documentation on [auditor users permissions](https://docs.gitlab.com/ee/administration/auditor_users.html#permissions-and-restrictions-of-an-auditor-user).
Auditor users are available in [GitLab Premium](https://about.gitlab.com/products/)
Auditor users are available in [GitLab Premium](https://about.gitlab.com/gitlab-ee/)
only.
only.
[^1]:On public and internal projects, all users are able to perform this action
[^1]:On public and internal projects, all users are able to perform this action
@@ -17,7 +17,7 @@ When you create a project in GitLab, you'll have access to a large number of
...
@@ -17,7 +17,7 @@ When you create a project in GitLab, you'll have access to a large number of
-[Issue tracker](issues/index.md): Discuss implementations with your team within issues
-[Issue tracker](issues/index.md): Discuss implementations with your team within issues
-[Issue Boards](issue_board.md): Organize and prioritize your workflow
-[Issue Boards](issue_board.md): Organize and prioritize your workflow
-[Multiple Issue Boards](https://docs.gitlab.com/ee/user/project/issue_board.html#multiple-issue-boards)(**Starter/Premium**): Allow your teams to create their own workflows (Issue Boards) for the same project
-[Multiple Issue Boards](issue_board.md#multiple-issue-boards)(**Starter/Premium**): Allow your teams to create their own workflows (Issue Boards) for the same project
-[Repositories](repository/index.md): Host your code in a fully
-[Repositories](repository/index.md): Host your code in a fully
integrated platform
integrated platform
-[Branches](repository/branches/index.md): use Git branching strategies to
-[Branches](repository/branches/index.md): use Git branching strategies to
...
@@ -33,10 +33,10 @@ integrated platform
...
@@ -33,10 +33,10 @@ integrated platform
-[Issue tracker](issues/index.md): Discuss implementations with your team within issues
-[Issue tracker](issues/index.md): Discuss implementations with your team within issues
-[Issue Boards](issue_board.md): Organize and prioritize your workflow
-[Issue Boards](issue_board.md): Organize and prioritize your workflow
-[Multiple Issue Boards](https://docs.gitlab.com/ee/user/project/issue_board.html#multiple-issue-boards)(**Starter/Premium**): Allow your teams to create their own workflows (Issue Boards) for the same project
-[Multiple Issue Boards](issue_board.md#multiple-issue-boards)(**Starter/Premium**): Allow your teams to create their own workflows (Issue Boards) for the same project
-[Merge Requests](merge_requests/index.md): Apply your branching
-[Merge Requests](merge_requests/index.md): Apply your branching
strategy and get reviewed by your team
strategy and get reviewed by your team
-[Merge Request Approvals](https://docs.gitlab.com/ee/user/project/merge_requests/merge_request_approvals.html)(**Starter/Premium**): Ask for approval before
-[Merge Request Approvals](merge_requests/merge_request_approvals.md)(**Starter/Premium**): Ask for approval before
implementing a change
implementing a change
-[Fix merge conflicts from the UI](merge_requests/resolve_conflicts.md):
-[Fix merge conflicts from the UI](merge_requests/resolve_conflicts.md):
- Enable [merge request approvals](https://docs.gitlab.com/ee/user/project/merge_requests/merge_request_approvals.html#merge-request-approvals), _available in [GitLab Starter](https://about.gitlab.com/products/)_.
- Enable [merge request approvals](https://docs.gitlab.com/ee/user/project/merge_requests/merge_request_approvals.html#merge-request-approvals), _available in [GitLab Starter](https://about.gitlab.com/gitlab-ee/)_.
- Enable [merge only of pipeline succeeds](../merge_requests/merge_when_pipeline_succeeds.md).
- Enable [merge only of pipeline succeeds](../merge_requests/merge_when_pipeline_succeeds.md).
- Enable [merge only when all discussions are resolved](../../discussions/index.md#only-allow-merge-requests-to-be-merged-if-all-discussions-are-resolved).
- Enable [merge only when all discussions are resolved](../../discussions/index.md#only-allow-merge-requests-to-be-merged-if-all-discussions-are-resolved).
...
@@ -42,7 +42,7 @@ Set up your project's merge request settings:
...
@@ -42,7 +42,7 @@ Set up your project's merge request settings:
### Service Desk
### Service Desk
Enable [Service Desk](https://docs.gitlab.com/ee/user/project/service_desk.html) for your project to offer customer support. Service Desk is available in [GitLab Premium](https://about.gitlab.com/products/).
Enable [Service Desk](https://docs.gitlab.com/ee/user/project/service_desk.html) for your project to offer customer support. Service Desk is available in [GitLab Premium](https://about.gitlab.com/gitlab-ee/).