Commit 4509fb64 authored by Marcia Ramos's avatar Marcia Ramos

search and replace "Enterprise Edition Premium" => "Premium"

parent 15c675d2
...@@ -25,7 +25,7 @@ Once you set up the Runner, add a new job to `.gitlab-ci.yml`, called `performan ...@@ -25,7 +25,7 @@ Once you set up the Runner, add a new job to `.gitlab-ci.yml`, called `performan
This will create a `performance` job in your CI/CD pipeline and will run Sitespeed.io against the webpage you define. The GitLab plugin for Sitespeed.io downloaded in order to export the results to JSON. For further customization options of Sitespeed.io, including the ability to provide a list of URLs to test, please consult their [documentation](https://www.sitespeed.io/documentation/sitespeed.io/configuration/). This will create a `performance` job in your CI/CD pipeline and will run Sitespeed.io against the webpage you define. The GitLab plugin for Sitespeed.io downloaded in order to export the results to JSON. For further customization options of Sitespeed.io, including the ability to provide a list of URLs to test, please consult their [documentation](https://www.sitespeed.io/documentation/sitespeed.io/configuration/).
For GitLab [Enterprise Edition Premium](https://about.gitlab.com/gitlab-ee/) users, this information can be automatically For [GitLab Premium](https://about.gitlab.com/gitlab-ee/) users, a performance score can be automatically
extracted and shown right in the merge request widget. [Learn more on performance diffs in merge requests](../../user/project/merge_requests/browser_performance_testing.md). extracted and shown right in the merge request widget. [Learn more on performance diffs in merge requests](../../user/project/merge_requests/browser_performance_testing.md).
## Performance testing on Review Apps ## Performance testing on Review Apps
......
...@@ -467,7 +467,7 @@ export CI_REGISTRY_PASSWORD="longalfanumstring" ...@@ -467,7 +467,7 @@ export CI_REGISTRY_PASSWORD="longalfanumstring"
[ee-2112]: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2112 [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" [ce-13784]: https://gitlab.com/gitlab-org/gitlab-ce/issues/13784 "Simple protection of CI secret variables"
[eep]: https://about.gitlab.com/gitlab-ee/ "Available only in GitLab Enterprise Edition Premium" [eep]: https://about.gitlab.com/gitlab-ee/ "Available only in GitLab Premium"
[envs]: ../environments.md [envs]: ../environments.md
[protected branches]: ../../user/project/protected_branches.md [protected branches]: ../../user/project/protected_branches.md
[protected tags]: ../../user/project/protected_tags.md [protected tags]: ../../user/project/protected_tags.md
......
...@@ -269,7 +269,7 @@ In GitLab Enterprise Edition Ultimate, any security warnings are also ...@@ -269,7 +269,7 @@ In GitLab Enterprise Edition Ultimate, any security warnings are also
### Auto Browser Performance Testing ### Auto Browser Performance Testing
> Introduced in [GitLab Enterprise Edition Premium][ee] 10.4. > Introduced in [GitLab Premium][ee] 10.4.
Auto Browser Performance Testing utilizes the [Sitespeed.io container](https://hub.docker.com/r/sitespeedio/sitespeed.io/) to measure the performance of a web page. A JSON report is created and uploaded as an artifact, which includes the overall performance score for each page. By default, the root page of Review and Production environments will be tested. If you would like to add additional URL's to test, simply add the paths to a file named `.gitlab-urls.txt` in the root directory, one per line. For example: Auto Browser Performance Testing utilizes the [Sitespeed.io container](https://hub.docker.com/r/sitespeedio/sitespeed.io/) to measure the performance of a web page. A JSON report is created and uploaded as an artifact, which includes the overall performance score for each page. By default, the root page of Review and Production environments will be tested. If you would like to add additional URL's to test, simply add the paths to a file named `.gitlab-urls.txt` in the root directory, one per line. For example:
...@@ -279,8 +279,12 @@ Auto Browser Performance Testing utilizes the [Sitespeed.io container](https://h ...@@ -279,8 +279,12 @@ Auto Browser Performance Testing utilizes the [Sitespeed.io container](https://h
/direction /direction
``` ```
<<<<<<< HEAD
In GitLab Enterprise Edition Premium, performance differences between the source In GitLab Enterprise Edition 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 "Enterprise Edition Premium" => "Premium"
### Auto Deploy ### Auto Deploy
......
...@@ -130,7 +130,7 @@ The user that locks a file or directory is the only one that can edit and push t ...@@ -130,7 +130,7 @@ The user that locks a file or directory is the only one that can edit and push t
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.
File Locking is available in File Locking is available in
[GitLab Enterprise Edition Premium](https://about.gitlab.com/gitlab-ee/) only. [GitLab Premium](https://about.gitlab.com/gitlab-ee/) only.
### Confidential Issues permissions ### Confidential Issues permissions
...@@ -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 Enterprise Edition Premium](https://about.gitlab.com/gitlab-ee/) 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
......
...@@ -190,7 +190,7 @@ The result will then be: ...@@ -190,7 +190,7 @@ The result will then be:
## Multiple Kubernetes clusters ## Multiple Kubernetes clusters
> Introduced in [GitLab Enterprise Edition Premium][ee] 10.3. > Introduced in [GitLab Premium][ee] 10.3.
With GitLab Premium, 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,
......
...@@ -154,7 +154,7 @@ Find it under your project's **Repository > Compare**. ...@@ -154,7 +154,7 @@ Find it under your project's **Repository > Compare**.
Lock your files to prevent any conflicting changes. Lock your files to prevent any conflicting changes.
[File Locking](https://docs.gitlab.com/ee/user/project/file_lock.html) is available only in [File Locking](https://docs.gitlab.com/ee/user/project/file_lock.html) is available only in
[GitLab Enterprise Edition Premium](https://about.gitlab.com/gitlab-ee/). [GitLab Premium](https://about.gitlab.com/gitlab-ee/).
## Repository's API ## Repository's API
......
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