Commit b314ef7d authored by Marcia Ramos's avatar Marcia Ramos

search and replace EES, EEP, EEU with Starter, Premium, Ultimate

parent cf644fc1
...@@ -87,10 +87,10 @@ _The artifacts are stored by default in ...@@ -87,10 +87,10 @@ _The artifacts are stored by default in
### Using object storage ### Using object storage
In [GitLab Enterprise Edition Premium][eep] you can use an object storage like > Available in [GitLab Premium](https://about.gitlab.com/products/) and
AWS S3 to store the artifacts. [GitLab.com Silver](https://about.gitlab.com/gitlab-com/).
[Learn how to use the object storage option.][ee-os] Use an [Object storage option][ee-os] like AWS S3 to store job artifacts.
## Expiring artifacts ## Expiring artifacts
...@@ -198,4 +198,3 @@ memory and disk I/O. ...@@ -198,4 +198,3 @@ memory and disk I/O.
[restart gitlab]: restart_gitlab.md "How to restart GitLab" [restart gitlab]: restart_gitlab.md "How to restart GitLab"
[gitlab workhorse]: https://gitlab.com/gitlab-org/gitlab-workhorse "GitLab Workhorse repository" [gitlab workhorse]: https://gitlab.com/gitlab-org/gitlab-workhorse "GitLab Workhorse repository"
[ee-os]: https://docs.gitlab.com/ee/administration/job_artifacts.html#using-object-storage [ee-os]: https://docs.gitlab.com/ee/administration/job_artifacts.html#using-object-storage
[eep]: https://about.gitlab.com/gitlab-ee/ "GitLab Enterprise Edition Premium"
...@@ -87,6 +87,6 @@ prefixed with `#{namespace}/#{project_name}`, which is true for CI Cache and LFS ...@@ -87,6 +87,6 @@ prefixed with `#{namespace}/#{project_name}`, which is true for CI Cache and LFS
| Pages | Yes | No | - | - | | Pages | Yes | No | - | - |
| Docker Registry | Yes | No | - | - | | Docker Registry | Yes | No | - | - |
| CI Build Logs | No | No | - | - | | CI Build Logs | No | No | - | - |
| CI Artifacts | No | No | Yes (EEP) | - | | CI Artifacts | No | No | Yes (Premium) | - |
| CI Cache | No | No | Yes | - | | CI Cache | No | No | Yes | - |
| LFS Objects | Yes | No | Yes (EEP) | - | | LFS Objects | Yes | No | Yes (Premium) | - |
...@@ -43,7 +43,7 @@ There's also a collection of repositories with [example projects](https://gitlab ...@@ -43,7 +43,7 @@ There's also a collection of repositories with [example projects](https://gitlab
### Static Application Security Testing (SAST) ### Static Application Security Testing (SAST)
- **(EEU)** [Scan your code for vulnerabilities](https://docs.gitlab.com/ee/ci/examples/sast.html) - **(Ultimate)** [Scan your code for vulnerabilities](https://docs.gitlab.com/ee/ci/examples/sast.html)
- [Scan your Docker images for vulnerabilities](sast_docker.md) - [Scan your Docker images for vulnerabilities](sast_docker.md)
### Dynamic Application Security Testing (DAST) ### Dynamic Application Security Testing (DAST)
......
...@@ -231,13 +231,15 @@ To enable this feature, navigate to the group settings page. Select ...@@ -231,13 +231,15 @@ To enable this feature, navigate to the group settings page. Select
![Checkbox for share with group lock](img/share_with_group_lock.png) ![Checkbox for share with group lock](img/share_with_group_lock.png)
#### Member Lock (EES/EEP) #### Member Lock
Available in [GitLab Enterprise Edition Starter](https://about.gitlab.com/gitlab-ee/), > Available in [GitLab Starter](https://about.gitlab.com/products/) and
with **Member Lock** it is possible to lock membership in project to the [GitLab.com Bronze](https://about.gitlab.com/gitlab-com/).
With **Member Lock** it is possible to lock membership in project to the
level of members in group. level of members in group.
Learn more about [Member Lock](https://docs.gitlab.com/ee/user/group/index.html#member-lock-ees-eep). Learn more about [Member Lock](https://docs.gitlab.com/ee/user/group/index.html#member-lock).
### Advanced settings ### Advanced settings
......
...@@ -117,7 +117,9 @@ and drag issues around. Read though the ...@@ -117,7 +117,9 @@ and drag issues around. Read though the
[documentation on Issue Boards permissions](project/issue_board.md#permissions) [documentation on Issue Boards permissions](project/issue_board.md#permissions)
to learn more. to learn more.
### File Locking permissions (EEP) ### File Locking permissions
> Available in [GitLab Premium](https://about.gitlab.com/products/).
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.
...@@ -251,7 +253,9 @@ for details about the pipelines security model. ...@@ -251,7 +253,9 @@ for details about the pipelines security model.
Since GitLab 8.15, LDAP user permissions can now be manually overridden by an admin user. Since GitLab 8.15, LDAP user permissions can now be manually overridden by an admin user.
Read through the documentation on [LDAP users permissions](https://docs.gitlab.com/ee/articles/how_to_configure_ldap_gitlab_ee/index.html#updating-user-permissions-new-feature) to learn more. Read through the documentation on [LDAP users permissions](https://docs.gitlab.com/ee/articles/how_to_configure_ldap_gitlab_ee/index.html#updating-user-permissions-new-feature) to learn more.
## Auditor users permissions (EEP) ## Auditor users permissions
> Available in [GitLab Premium](https://about.gitlab.com/products/).
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).
......
...@@ -192,7 +192,7 @@ The result will then be: ...@@ -192,7 +192,7 @@ The result will then be:
> Introduced in [GitLab Enterprise Edition Premium][ee] 10.3. > Introduced in [GitLab Enterprise Edition Premium][ee] 10.3.
With GitLab EEP, you can associate more than one Kubernetes clusters to your With GitLab Premium, you can associate more than one Kubernetes clusters to your
project. That way you can have different clusters for different environments, project. That way you can have different clusters for different environments,
like dev, staging, production, etc. like dev, staging, production, etc.
...@@ -249,9 +249,9 @@ and [add a cluster](#adding-a-cluster) again. ...@@ -249,9 +249,9 @@ and [add a cluster](#adding-a-cluster) again.
Here's what you can do with GitLab if you enable the Kubernetes integration. Here's what you can do with GitLab if you enable the Kubernetes integration.
### Deploy Boards (EEP) ### Deploy Boards
> Available in [GitLab Enterprise Edition Premium][ee]. > Available in [GitLab Premium][ee].
GitLab's Deploy Boards offer a consolidated view of the current health and GitLab's Deploy Boards offer a consolidated view of the current health and
status of each CI [environment](../../../ci/environments.md) running on Kubernetes, status of each CI [environment](../../../ci/environments.md) running on Kubernetes,
...@@ -261,9 +261,9 @@ workflow they already use without any need to access Kubernetes. ...@@ -261,9 +261,9 @@ workflow they already use without any need to access Kubernetes.
[> Read more about Deploy Boards](https://docs.gitlab.com/ee/user/project/deploy_boards.html) [> Read more about Deploy Boards](https://docs.gitlab.com/ee/user/project/deploy_boards.html)
### Canary Deployments (EEP) ### Canary Deployments
> Available in [GitLab Enterprise Edition Premium][ee]. > Available in [GitLab Premium][ee].
Leverage [Kubernetes' Canary deployments](https://kubernetes.io/docs/concepts/cluster-administration/manage-deployment/#canary-deployments) Leverage [Kubernetes' Canary deployments](https://kubernetes.io/docs/concepts/cluster-administration/manage-deployment/#canary-deployments)
and visualize your canary deployments right inside the Deploy Board, without and visualize your canary deployments right inside the Deploy Board, without
......
...@@ -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) (**EES/EEP**): Allow your teams to create their own workflows (Issue Boards) for the same project - [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
- [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
...@@ -29,7 +29,7 @@ integrated platform ...@@ -29,7 +29,7 @@ integrated platform
- [Signing commits](gpg_signed_commits/index.md): use GPG to sign your commits - [Signing commits](gpg_signed_commits/index.md): use GPG to sign your commits
- [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) (**EES/EEP**): Ask for approval before - [Merge Request Approvals](https://docs.gitlab.com/ee/user/project/merge_requests/merge_request_approvals.html) (**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):
Your Git diff tool right from GitLab's UI Your Git diff tool right from GitLab's UI
......
...@@ -81,9 +81,9 @@ GitLab CI/CD build environment: ...@@ -81,9 +81,9 @@ GitLab CI/CD build environment:
Here's what you can do with GitLab if you enable the Kubernetes integration. Here's what you can do with GitLab if you enable the Kubernetes integration.
### Deploy Boards (EEP) ### Deploy Boards
> Available in [GitLab Enterprise Edition Premium][ee]. > Available in [GitLab Premium][ee].
GitLab's Deploy Boards offer a consolidated view of the current health and GitLab's Deploy Boards offer a consolidated view of the current health and
status of each CI [environment](../../../ci/environments.md) running on Kubernetes, status of each CI [environment](../../../ci/environments.md) running on Kubernetes,
...@@ -93,9 +93,9 @@ workflow they already use without any need to access Kubernetes. ...@@ -93,9 +93,9 @@ workflow they already use without any need to access Kubernetes.
[> Read more about Deploy Boards](https://docs.gitlab.com/ee/user/project/deploy_boards.html) [> Read more about Deploy Boards](https://docs.gitlab.com/ee/user/project/deploy_boards.html)
### Canary Deployments (EEP) ### Canary Deployments
> Available in [GitLab Enterprise Edition Premium][ee]. > Available in [GitLab Premium][ee].
Leverage [Kubernetes' Canary deployments](https://kubernetes.io/docs/concepts/cluster-administration/manage-deployment/#canary-deployments) Leverage [Kubernetes' Canary deployments](https://kubernetes.io/docs/concepts/cluster-administration/manage-deployment/#canary-deployments)
and visualize your canary deployments right inside the Deploy Board, without and visualize your canary deployments right inside the Deploy Board, without
...@@ -134,4 +134,4 @@ containers. To use this integration, you should deploy to Kubernetes using ...@@ -134,4 +134,4 @@ containers. To use this integration, you should deploy to Kubernetes using
the deployment variables above, ensuring any pods you create are labelled with the deployment variables above, ensuring any pods you create are labelled with
`app=$CI_ENVIRONMENT_SLUG`. GitLab will do the rest! `app=$CI_ENVIRONMENT_SLUG`. GitLab will do the rest!
[ee]: https://about.gitlab.com/gitlab-ee/ [ee]: https://about.gitlab.com/products/
...@@ -41,9 +41,10 @@ it's reassigned to someone else to take it from there. ...@@ -41,9 +41,10 @@ it's reassigned to someone else to take it from there.
if a user is not member of that project, it can only be if a user is not member of that project, it can only be
assigned to them if they created the issue themselves. assigned to them if they created the issue themselves.
##### 3.1. Multiple Assignees (EES/EEP) ##### 3.1. Multiple Assignees
Multiple Assignees are only available in [GitLab Enterprise Edition](https://about.gitlab.com/gitlab-ee/). > Available in [GitLab Starter](https://about.gitlab.com/products/) and
[GitLab.com Bronze](https://about.gitlab.com/gitlab-com/).
Often multiple people likely work on the same issue together, Often multiple people likely work on the same issue together,
which can especially be difficult to track in large teams which can especially be difficult to track in large teams
...@@ -88,9 +89,10 @@ but they are immediately available to all projects in the group. ...@@ -88,9 +89,10 @@ but they are immediately available to all projects in the group.
> **Tip:** > **Tip:**
if the label doesn't exist yet, when you click **Edit**, it opens a dropdown menu from which you can select **Create new label**. if the label doesn't exist yet, when you click **Edit**, it opens a dropdown menu from which you can select **Create new label**.
#### 8. Weight (EES/EEP) #### 8. Weight
Issue Weights are only available in [GitLab Enterprise Edition](https://about.gitlab.com/gitlab-ee/). > Available in [GitLab Starter](https://about.gitlab.com/products/) and
[GitLab.com Bronze](https://about.gitlab.com/gitlab-com/).
- Attribute a weight (in a 0 to 9 range) to that issue. Easy to complete - Attribute a weight (in a 0 to 9 range) to that issue. Easy to complete
should weight 1 and very hard to complete should weight 9. should weight 1 and very hard to complete should weight 9.
......
...@@ -147,7 +147,9 @@ Select branches to compare and view the changes inline: ...@@ -147,7 +147,9 @@ Select branches to compare and view the changes inline:
Find it under your project's **Repository > Compare**. Find it under your project's **Repository > Compare**.
## Locked files (EEP) ## Locked files
> Available in [GitLab Premium](https://about.gitlab.com/products/).
Lock your files to prevent any conflicting changes. Lock your files to prevent any conflicting changes.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment