Commit dde26697 authored by Marcia Ramos's avatar Marcia Ramos Committed by Achilleas Pipinellis

EE - search and replace "Enterprise Edition Ultimate" => "Ultimate"

parent 3b3ee4b9
......@@ -256,7 +256,7 @@ If `allow_username_or_email_login` is enabled in the LDAP configuration, GitLab
## LDAP extended features on GitLab EE
With [GitLab Enterprise Edition (EE)](https://about.gitlab.com/products/), besides everything we just described, you'll
With [GitLab Enterprise Edition (EE)](https://about.gitlab.com/gitlab-ee/), besides everything we just described, you'll
have extended functionalities with LDAP, such as:
- Group sync
......
# Administrator documentation
Learn how to administer your GitLab instance (Community Edition and
[Enterprise Editions](https://about.gitlab.com/products/)).
[Enterprise Editions](https://about.gitlab.com/gitlab-ee/)).
Regular users don't have access to GitLab administration tools and settings.
GitLab.com is administered by GitLab, Inc., therefore, only GitLab team members have
......
......@@ -31,4 +31,4 @@ diffs in merge requests](../../user/project/merge_requests/code_quality_diff.md)
[cli]: https://github.com/codeclimate/codeclimate
[dind]: ../docker/using_docker_build.md#use-docker-in-docker-executor
[ee]: https://about.gitlab.com/products/
[ee]: https://about.gitlab.com/gitlab-ee/
......@@ -37,4 +37,4 @@ so, the CI job must be named `dast` and the artifact path must be
`gl-dast-report.json`.
[Learn more about DAST results shown in merge requests](../../user/project/merge_requests/dast.md).
[ee]: https://about.gitlab.com/products/
[ee]: https://about.gitlab.com/gitlab-ee/
# Static Application Security Testing with GitLab CI/CD
NOTE: **Note:**
In order to use this tool, a [GitLab Enterprise Edition Ultimate][ee] license
In order to use this tool, a [GitLab Ultimate][ee] license
is needed.
This example shows how to run
......@@ -36,7 +36,7 @@ The results are sorted by the priority of the vulnerability:
1. Everything else
TIP: **Tip:**
Starting with [GitLab Enterprise Edition Ultimate][ee] 10.3, this information will
Starting with [GitLab Ultimate][ee] 10.3, this information will
be automatically extracted and shown right in the merge request widget. To do
so, the CI job must be named `sast` and the artifact path must be
`gl-sast-report.json`.
......
......@@ -52,4 +52,4 @@ so, the CI/CD job must be named `sast:container` and the artifact path must be
`gl-sast-container-report.json`.
[Learn more on application security testing results shown in merge requests](../../user/project/merge_requests/sast_docker.md).
[ee]: https://about.gitlab.com/products/
[ee]: https://about.gitlab.com/gitlab-ee/
......@@ -276,7 +276,7 @@ removed with one of the future versions of GitLab. You are advised to
[ee-2017]: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2017
[ee-2346]: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2346
[ci-229]: https://gitlab.com/gitlab-org/gitlab-ci/merge_requests/229
[ee]: https://about.gitlab.com/products/
[ee]: https://about.gitlab.com/gitlab-ee/
[variables]: ../variables/README.md
[predef]: ../variables/README.md#predefined-variables-environment-variables
[registry]: ../../user/project/container_registry.md
......
......@@ -200,7 +200,7 @@ Once you set them, they will be available for all subsequent pipelines.
### Limiting environment scopes of secret variables
>**Notes:**
[Introduced][ee-2112] in [GitLab Premium][eep] 9.4.
[Introduced][ee-2112] in [GitLab Premium][premium] 9.4.
You can limit the environment scope of a secret variable by
[defining which environments][envs] it can be available for.
......@@ -467,7 +467,7 @@ export CI_REGISTRY_PASSWORD="longalfanumstring"
[ee-2112]: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2112
[ce-13784]: https://gitlab.com/gitlab-org/gitlab-ce/issues/13784 "Simple protection of CI secret variables"
[eep]: https://about.gitlab.com/products/ "Available only in GitLab Premium"
[premium]: https://about.gitlab.com/products/ "Available only in GitLab Premium"
[envs]: ../environments.md
[protected branches]: ../../user/project/protected_branches.md
[protected tags]: ../../user/project/protected_tags.md
......
......@@ -2,7 +2,7 @@
## Software delivery
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.
......
......@@ -21,7 +21,7 @@ and click a button to begin the upgrade process.
## 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:
* PostgreSQL
* Pages
......@@ -41,5 +41,5 @@ website:
- [Product page](https://network.pivotal.io/products/p-gitlab/)
- [Documentation](https://docs.pivotal.io/partners/gitlab/index.html)
[eep]: https://about.gitlab.com/gitlab-ee/
[premium]: https://about.gitlab.com/products/
[pcf]: https://pivotal.io/platform
......@@ -279,12 +279,8 @@ Auto Browser Performance Testing utilizes the [Sitespeed.io container](https://h
/direction
```
<<<<<<< HEAD
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).
=======
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"
### Auto Deploy
......@@ -598,4 +594,4 @@ curl --data "value=true" --header "PRIVATE-TOKEN: personal_access_token" https:/
[postgresql]: https://www.postgresql.org/
[Auto DevOps template]: https://gitlab.com/gitlab-org/gitlab-ci-yml/blob/master/Auto-DevOps.gitlab-ci.yml
[GitLab Omnibus Helm Chart]: ../../install/kubernetes/gitlab_omnibus.md
[ee]: https://about.gitlab.com/products/
[ee]: https://about.gitlab.com/gitlab-ee/
# Epics
> Introduced in [GitLab Enterprise Edition Ultimate][ee] 10.2.
> Introduced in [GitLab Ultimate][ee] 10.2.
Epics let you manage your portfolio of projects more efficiently and with less
effort by tracking groups of issues that share a theme, across projects and
......
......@@ -152,17 +152,18 @@ There are two different ways to add a new project to a group:
![Select group](img/select_group_dropdown.png)
### (Premium) Default project creation level
### Default project creation level
> Available in [GitLab Premium](https://about.gitlab.com/products/) and
[GitLab.com Silver](https://about.gitlab.com/gitlab-com/).
This feature allows groups to define a default project creation level.
By default, `Developers` and `Masters` are allowed to create projects, but
this can be changed within the group settings for a group, or the default setting
changed within the Admin area (`Settings`, `Visibility and Access Controls`). This
can be `None`, `Masters`, or `Developers + Masters`.
It is available only in [GitLab Premium][eep].
## Transfer projects into groups
Learn how to [transfer a project into a group](../project/index.md#transfer-an-existing-project-into-a-group).
......@@ -181,7 +182,7 @@ See [the GitLab Enterprise Edition documentation](../../integration/ldap.md) for
## Epics
> Introduced in [GitLab Enterprise Edition Ultimate][ee] 10.2.
> Introduced in [GitLab Ultimate][ee] 10.2.
Epics let you manage your portfolio of projects more efficiently and with less
effort by tracking groups of issues that share a theme, across projects and
......
......@@ -123,14 +123,14 @@ to learn more.
### File Locking permissions
> 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.
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.
File Locking is available in
[GitLab Premium](https://about.gitlab.com/products/) only.
[GitLab Premium](https://about.gitlab.com/gitlab-ee/) only.
### Confidential Issues permissions
......@@ -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
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.
[^1]: On public and internal projects, all users are able to perform this action
......
......@@ -303,4 +303,4 @@ the deployment variables above, ensuring any pods you create are labelled with
`app=$CI_ENVIRONMENT_SLUG`. GitLab will do the rest!
[permissions]: ../../permissions.md
[ee]: https://about.gitlab.com/products/
[ee]: https://about.gitlab.com/gitlab-ee/
......@@ -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 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
integrated platform
- [Branches](repository/branches/index.md): use Git branching strategies to
......@@ -33,10 +33,10 @@ integrated platform
- [Issue tracker](issues/index.md): Discuss implementations with your team within issues
- [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
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
- [Fix merge conflicts from the UI](merge_requests/resolve_conflicts.md):
Your Git diff tool right from GitLab's UI
......
......@@ -34,7 +34,7 @@ and deploy from one single platform. Issue Boards help you to visualize
and manage the entire process _in_ GitLab.
With [Multiple Issue Boards](#multiple-issue-boards), available
only in [GitLab Enterprise Edition](https://about.gitlab.com/products/),
only in [GitLab Enterprise Edition](https://about.gitlab.com/gitlab-ee/),
you go even further, as you can not only keep yourself and your project
organized from a broader perspective with one Issue Board per project,
but also allow your team members to organize their own workflow by creating
......
......@@ -35,7 +35,7 @@ your project public, open to collaboration.
### Streamline collaboration
With [Multiple Assignees for Issues](multiple_assignees_for_issues.md),
available in [GitLab Starter](https://about.gitlab.com/products/)
available in [GitLab Starter](https://about.gitlab.com/gitlab-ee/)
you can streamline collaboration and allow shared responsibilities to be clearly displayed.
All assignees are shown across your workflows and receive notifications (as they
would as single assignees), simplifying communication and ownership.
......@@ -141,7 +141,10 @@ Find GitLab Issue Boards by navigating to your **Project's Dashboard** > **Issue
Read through the documentation for [Issue Boards](../issue_board.md)
to find out more about this feature.
### Export Issues to CSV (Starter/Premium)
### Export Issues to CSV
> Available in [GitLab Starter](https://about.gitlab.com/products/) and
[GitLab.com Bronze](https://about.gitlab.com/gitlab-com/).
Issues can be [exported as CSV](csv_export.md) from GitLab and are sent to your email as an attachment.
......
# Dynamic Application Security Testing (DAST)
> [Introduced][ee-4348] in [GitLab Enterprise Edition Ultimate][ee] 10.4.
> [Introduced][ee-4348] in [GitLab Ultimate][ee] 10.4.
If you are using [GitLab CI/CD][ci], you can analyze your running web application(s)
for known vulnerabilities using Dynamic Application Security Testing (DAST).
......
......@@ -201,7 +201,7 @@ can show the Code Climate report right in the merge request widget area.
## Static Application Security Testing
> Introduced in [GitLab Enterprise Edition Ultimate][products] 10.3.
> Introduced in [GitLab Ultimate][products] 10.3.
If you are using [GitLab CI/CD][ci], you can analyze your source code for known
vulnerabilities using Static Application Security Testing (SAST).
......@@ -212,7 +212,7 @@ merge request widget area.
## Static Application Security Testing for Docker containers
> Introduced in [GitLab Enterprise Edition Ultimate][products] 10.4.
> Introduced in [GitLab Ultimate][products] 10.4.
If you are using [GitLab CI/CD][ci], you can analyze your Docker images for known
vulnerabilities.
......@@ -361,6 +361,6 @@ git checkout origin/merge-requests/1
[ci]: ../../../ci/README.md
[cc]: https://codeclimate.com/
[cd]: https://hub.docker.com/r/codeclimate/codeclimate/
[ee]: https://about.gitlab.com/gitlab-ee/ "GitLab Enterprise Edition"
[sitespeed]: https://www.sitespeed.io
[sitespeed-container]: https://hub.docker.com/r/sitespeedio/sitespeed.io/
[ee]: https://about.gitlab.com/products/ "GitLab Enterprise Edition"
# Static Application Security Testing (SAST)
> [Introduced][ee-3775] in [GitLab Enterprise Edition Ultimate][ee] 10.3.
> [Introduced][ee-3775] in [GitLab Ultimate][ee] 10.3.
## Overview
......
# Static Application Security Testing for Docker containers
> [Introduced][ee-3672] in [GitLab Enterprise Edition Ultimate][ee] 10.4.
> [Introduced][ee-3672] in [GitLab Ultimate][ee] 10.4.
## Overview
......
......@@ -66,7 +66,7 @@ your implementation with your team.
You can live preview changes submitted to a new branch with
[Review Apps](../../../ci/review_apps/index.md).
With [GitLab Enterprise Edition](https://about.gitlab.com/products/)
With [GitLab Enterprise Edition](https://about.gitlab.com/gitlab-ee/)
subscriptions, you can also request
[approval](https://docs.gitlab.com/ee/user/project/merge_requests/merge_request_approvals.html#merge-request-approvals) from your managers.
......@@ -154,7 +154,7 @@ Find it under your project's **Repository > Compare**.
Lock your files to prevent any conflicting changes.
[File Locking](https://docs.gitlab.com/ee/user/project/file_lock.html) is available only in
[GitLab Premium](https://about.gitlab.com/products/).
[GitLab Premium](https://about.gitlab.com/gitlab-ee/).
## Repository's API
......
......@@ -34,7 +34,7 @@ Set up your project's merge request settings:
- Set up the merge request method (merge commit, [fast-forward merge](../merge_requests/fast_forward_merge.html)).
- Merge request [description templates](../description_templates.md#description-templates).
- 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 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:
### 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/).
### Export project
......
# Web IDE
> Introduced in [GitLab Enterprise Edition Ultimate][ee] 10.4.
> Introduced in [GitLab Ultimate][ee] 10.4.
> **Warning:** Web IDE is in **Beta**. For the latest updates, check the
> associated [epic](https://gitlab.com/groups/gitlab-org/-/epics/26).
......
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