Commit 3b3ee4b9 authored by Marcia Ramos's avatar Marcia Ramos Committed by Achilleas Pipinellis

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

parent ef741d86
...@@ -75,7 +75,7 @@ From there, you can see the following actions: ...@@ -75,7 +75,7 @@ From there, you can see the following actions:
### Instance events ### Instance events
> [Introduced][ee-2336] in [GitLab Enterprise Edition Premium][ee] 9.3. > [Introduced][ee-2336] in [GitLab Premium][ee] 9.3.
Available only for GitLab administrators. Available only for GitLab administrators.
Server-wide audit logging introduces the ability to observe user actions across Server-wide audit logging introduces the ability to observe user actions across
......
# Auditor users # Auditor users
>[Introduced][ee-998] in [GitLab Enterprise Edition Premium][eep] 8.17. >[Introduced][ee-998] in [GitLab Premium][eep] 8.17.
Auditor users are given read-only access to all projects, groups, and other Auditor users are given read-only access to all projects, groups, and other
resources on the GitLab instance. resources on the GitLab instance.
......
...@@ -54,7 +54,7 @@ new groups they might be added to when the user logs in. That way they don't nee ...@@ -54,7 +54,7 @@ new groups they might be added to when the user logs in. That way they don't nee
to wait for the hourly sync to be granted access to the groups that they are in to wait for the hourly sync to be granted access to the groups that they are in
in LDAP. in LDAP.
In GitLab Enterprise Edition Premium, we can also add a GitLab group to sync with one or multiple LDAP groups or we can In GitLab Premium, we can also add a GitLab group to sync with one or multiple LDAP groups or we can
also add a filter. The filter must comply with the syntax defined in [RFC 2254](https://tools.ietf.org/search/rfc2254). also add a filter. The filter must comply with the syntax defined in [RFC 2254](https://tools.ietf.org/search/rfc2254).
A group sync process will run every hour on the hour, and `group_base` must be set A group sync process will run every hour on the hour, and `group_base` must be set
......
# Database Load Balancing # Database Load Balancing
> [Introduced][ee-1283] in [GitLab Enterprise Edition Premium][eep] 9.0. > [Introduced][ee-1283] in [GitLab Premium][eep] 9.0.
Distribute read-only queries among multiple database servers. Distribute read-only queries among multiple database servers.
...@@ -158,7 +158,7 @@ log entries easier. For example: ...@@ -158,7 +158,7 @@ log entries easier. For example:
## Handling Stale Reads ## Handling Stale Reads
> [Introduced][ee-3526] in [GitLab Enterprise Edition Premium][eep] 10.3. > [Introduced][ee-3526] in [GitLab Premium][eep] 10.3.
To prevent reading from an outdated secondary the load balancer will check if it To prevent reading from an outdated secondary the load balancer will check if it
is in sync with the primary. If the data is determined to be recent enough the is in sync with the primary. If the data is determined to be recent enough the
......
...@@ -6,7 +6,7 @@ PostgreSQL. This is the database that will be installed if you use the ...@@ -6,7 +6,7 @@ PostgreSQL. This is the database that will be installed if you use the
Omnibus package to manage your database. Omnibus package to manage your database.
> Important notes: > Important notes:
- This document will focus only on configuration supported with [GitLab Enterprise Edition Premium](https://about.gitlab.com/gitlab-ee/), using the Omnibus GitLab package. - This document will focus only on configuration supported with [GitLab Premium](https://about.gitlab.com/gitlab-ee/), using the Omnibus GitLab package.
- If you are a Community Edition or Starter user, consider using a cloud hosted solution. - If you are a Community Edition or Starter user, consider using a cloud hosted solution.
- This document will not cover installations from source. - This document will not cover installations from source.
......
...@@ -88,7 +88,7 @@ _The artifacts are stored by default in ...@@ -88,7 +88,7 @@ _The artifacts are stored by default in
### Using object storage ### Using object storage
>**Notes:** >**Notes:**
- [Introduced][ee-1762] in [GitLab Enterprise Edition Premium][eep] 9.4. - [Introduced][ee-1762] in [GitLab Premium][eep] 9.4.
- Since version 9.5, artifacts are [browsable], when object storage is enabled. - Since version 9.5, artifacts are [browsable], when object storage is enabled.
9.4 lacks this feature. 9.4 lacks this feature.
> Available in [GitLab Premium](https://about.gitlab.com/products/) and > Available in [GitLab Premium](https://about.gitlab.com/products/) and
...@@ -284,7 +284,7 @@ memory and disk I/O. ...@@ -284,7 +284,7 @@ memory and disk I/O.
[reconfigure gitlab]: restart_gitlab.md#omnibus-gitlab-reconfigure "How to reconfigure Omnibus GitLab" [reconfigure gitlab]: restart_gitlab.md#omnibus-gitlab-reconfigure "How to reconfigure Omnibus GitLab"
[restart gitlab]: restart_gitlab.md#installations-from-source "How to restart GitLab" [restart gitlab]: restart_gitlab.md#installations-from-source "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"
[eep]: https://about.gitlab.com/gitlab-ee/ "GitLab Enterprise Edition Premium" [eep]: https://about.gitlab.com/gitlab-ee/ "GitLab Premium"
[ee-1762]: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1762 [ee-1762]: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1762
[browsable]: ../user/project/pipelines/job_artifacts.md#browsing-job-artifacts [browsable]: ../user/project/pipelines/job_artifacts.md#browsing-job-artifacts
[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
...@@ -297,7 +297,7 @@ Example of response ...@@ -297,7 +297,7 @@ Example of response
> **Notes**: > **Notes**:
- [Introduced][ce-2893] in GitLab 8.5. - [Introduced][ce-2893] in GitLab 8.5.
- The use of `CI_JOB_TOKEN` in the artifacts download API was [introduced][ee-2346] - The use of `CI_JOB_TOKEN` in the artifacts download API was [introduced][ee-2346]
in [GitLab Enterprise Edition Premium][ee] 9.5. in [GitLab Premium][ee] 9.5.
Get job artifacts of a project. Get job artifacts of a project.
...@@ -345,7 +345,7 @@ Response: ...@@ -345,7 +345,7 @@ Response:
> **Notes**: > **Notes**:
- [Introduced][ce-5347] in GitLab 8.10. - [Introduced][ce-5347] in GitLab 8.10.
- The use of `CI_JOB_TOKEN` in the artifacts download API was [introduced][ee-2346] - The use of `CI_JOB_TOKEN` in the artifacts download API was [introduced][ee-2346]
in [GitLab Enterprise Edition Premium][ee] 9.5. in [GitLab Premium][ee] 9.5.
Download the artifacts archive from the given reference name and job provided the Download the artifacts archive from the given reference name and job provided the
job finished successfully. job finished successfully.
......
# Multi-project pipeline graphs # Multi-project pipeline graphs
> [Introduced](https://gitlab.com/gitlab-org/gitlab-ee/issues/2121) in > [Introduced](https://gitlab.com/gitlab-org/gitlab-ee/issues/2121) in
[GitLab Enterprise Edition Premium 9.3](https://about.gitlab.com/2017/06/22/gitlab-9-3-released/#multi-project-pipeline-graphs). [GitLab Premium 9.3](https://about.gitlab.com/2017/06/22/gitlab-9-3-released/#multi-project-pipeline-graphs).
When you set up [GitLab CI/CD](README.md) across multiple projects, you can visualize When you set up [GitLab CI/CD](README.md) across multiple projects, you can visualize
the entire pipeline, including all multi-project stages. the entire pipeline, including all multi-project stages.
......
...@@ -191,7 +191,7 @@ by name. The order of severity is: ...@@ -191,7 +191,7 @@ by name. The order of severity is:
With [multi-project pipeline graphs](multi_project_pipeline_graphs.md), With [multi-project pipeline graphs](multi_project_pipeline_graphs.md),
you can visualize cross-project pipelines. you can visualize cross-project pipelines.
It is available only in [GitLab Enterprise Edition Premium][eep]. It is available only in [GitLab Premium][eep].
## How the pipeline duration is calculated ## How the pipeline duration is calculated
...@@ -266,5 +266,5 @@ runners will not use regular runners, they must be tagged accordingly. ...@@ -266,5 +266,5 @@ runners will not use regular runners, they must be tagged accordingly.
[ce-7931]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7931 [ce-7931]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7931
[ce-9760]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9760 [ce-9760]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9760
[regexp]: https://gitlab.com/gitlab-org/gitlab-ce/blob/2f3dc314f42dbd79813e6251792853bc231e69dd/app/models/commit_status.rb#L99 [regexp]: https://gitlab.com/gitlab-org/gitlab-ce/blob/2f3dc314f42dbd79813e6251792853bc231e69dd/app/models/commit_status.rb#L99
[eep]: https://about.gitlab.com/gitlab-ee/ "GitLab Enterprise Edition Premium" [eep]: https://about.gitlab.com/gitlab-ee/ "GitLab Premium"
[ee-2121]: https://gitlab.com/gitlab-org/gitlab-ee/issues/2121 [ee-2121]: https://gitlab.com/gitlab-org/gitlab-ee/issues/2121
...@@ -25,7 +25,7 @@ with the [GitLab Container Registry][registry]) in the following cases. ...@@ -25,7 +25,7 @@ with the [GitLab Container Registry][registry]) in the following cases.
> **Note**: > **Note**:
The use of `CI_JOB_TOKEN` for multi-project pipelines was [introduced][ee-2017] The use of `CI_JOB_TOKEN` for multi-project pipelines was [introduced][ee-2017]
in [GitLab Enterprise Edition Premium][ee] 9.3. in [GitLab Premium][ee] 9.3.
This way of triggering can only be used when invoked inside `.gitlab-ci.yml`, This way of triggering can only be used when invoked inside `.gitlab-ci.yml`,
and it creates a dependent pipeline relation visible on the and it creates a dependent pipeline relation visible on the
...@@ -49,7 +49,7 @@ Read more about the [pipelines trigger API][trigapi]. ...@@ -49,7 +49,7 @@ Read more about the [pipelines trigger API][trigapi].
> **Note**: > **Note**:
The use of `CI_JOB_TOKEN` in the artifacts download API was [introduced][ee-2346] The use of `CI_JOB_TOKEN` in the artifacts download API was [introduced][ee-2346]
in [GitLab Enterprise Edition Premium][ee] 9.5. in [GitLab Premium][ee] 9.5.
With the introduction of dependencies between different projects, one of With the introduction of dependencies between different projects, one of
them may need to access artifacts created by a previous one. This process them may need to access artifacts created by a previous one. This process
......
...@@ -200,7 +200,7 @@ Once you set them, they will be available for all subsequent pipelines. ...@@ -200,7 +200,7 @@ Once you set them, they will be available for all subsequent pipelines.
### Limiting environment scopes of secret variables ### Limiting environment scopes of secret variables
>**Notes:** >**Notes:**
[Introduced][ee-2112] in [GitLab Enterprise Edition Premium][eep] 9.4. [Introduced][ee-2112] in [GitLab Premium][eep] 9.4.
You can limit the environment scope of a secret variable by You can limit the environment scope of a secret variable by
[defining which environments][envs] it can be available for. [defining which environments][envs] it can be available for.
......
# GitLab Geo # GitLab Geo
> **Notes:** > **Notes:**
- GitLab Geo is part of [GitLab Enterprise Edition Premium][ee]. - GitLab Geo is part of [GitLab Premium][ee].
- Introduced in GitLab Enterprise Edition 8.9. - Introduced in GitLab Enterprise Edition 8.9.
We recommend you use it with at least GitLab Enterprise Edition 10.0 for We recommend you use it with at least GitLab Enterprise Edition 10.0 for
basic Geo features, or latest version for a better experience. basic Geo features, or latest version for a better experience.
...@@ -40,7 +40,7 @@ Keep in mind that: ...@@ -40,7 +40,7 @@ Keep in mind that:
- Secondaries talk to the primary to get user data for logins (API) and to - Secondaries talk to the primary to get user data for logins (API) and to
replicate repositories, LFS Objects and Attachments (HTTPS + JWT). replicate repositories, LFS Objects and Attachments (HTTPS + JWT).
- Since GitLab Enterprise Edition Premium 10.0, the primary no longer talks to - Since GitLab Premium 10.0, the primary no longer talks to
secondaries to notify for changes (API). secondaries to notify for changes (API).
## Use-cases ## Use-cases
......
...@@ -37,7 +37,7 @@ the full process of installing GitLab on Google Container Engine (GKE), pushing ...@@ -37,7 +37,7 @@ the full process of installing GitLab on Google Container Engine (GKE), pushing
- _Testing only!_ [DigitalOcean and Docker Machine](digitaloceandocker.md) - - _Testing only!_ [DigitalOcean and Docker Machine](digitaloceandocker.md) -
Quickly test any version of GitLab on DigitalOcean using Docker Machine. Quickly test any version of GitLab on DigitalOcean using Docker Machine.
- [GitLab Pivotal Tile](pivotal/index.md) - Install and configure GitLab - [GitLab Pivotal Tile](pivotal/index.md) - Install and configure GitLab
Enterprise Edition Premium on Pivotal Cloud Foundry. Premium on Pivotal Cloud Foundry.
- [Getting started with GitLab and DigitalOcean](ttps://about.gitlab.com/2016/04/27/getting-started-with-gitlab-and-digitalocean/): requirements, installation process, updates. - [Getting started with GitLab and DigitalOcean](ttps://about.gitlab.com/2016/04/27/getting-started-with-gitlab-and-digitalocean/): requirements, installation process, updates.
- [Demo: Cloud Native Development with GitLab](https://about.gitlab.com/2017/04/18/cloud-native-demo/): video demonstration on how to install GitLab on Kubernetes, build a project, create Review Apps, store Docker images in Container Registry, deploy to production on Kubernetes, and monitor with Prometheus. - [Demo: Cloud Native Development with GitLab](https://about.gitlab.com/2017/04/18/cloud-native-demo/): video demonstration on how to install GitLab on Kubernetes, build a project, create Review Apps, store Docker images in Container Registry, deploy to production on Kubernetes, and monitor with Prometheus.
......
# GitLab Pivotal Tile # GitLab Pivotal Tile
> Introduced in [GitLab Enterprise Edition Premium][eep] 8.2. > Introduced in [GitLab Premium][eep] 8.2.
Easily deploy GitLab as a pre-configured appliance using Ops Manager (BOSH) for Easily deploy GitLab as a pre-configured appliance using Ops Manager (BOSH) for
[Pivotal Cloud Foundry][pcf]. [Pivotal Cloud Foundry][pcf].
...@@ -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 [Enterprise Edition 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 [Premium] and includes nearly all of its features. The features in Premium but _not_ supported on the Tile are:
* PostgreSQL * PostgreSQL
* Pages * Pages
......
# GitLab JIRA Development Panel integration # GitLab JIRA Development Panel integration
> [Introduced][ee-2381] in [GitLab Enterprise Edition Premium][eep] 10.0. > [Introduced][ee-2381] in [GitLab Premium][eep] 10.0.
As an extension to our [existing JIRA][existing-jira] project integration, you're now able to integrate As an extension to our [existing JIRA][existing-jira] project integration, you're now able to integrate
all your GitLab projects with [JIRA Development Panel][jira-development-panel]. Both can be used all your GitLab projects with [JIRA Development Panel][jira-development-panel]. Both can be used
......
...@@ -280,11 +280,11 @@ Auto Browser Performance Testing utilizes the [Sitespeed.io container](https://h ...@@ -280,11 +280,11 @@ Auto Browser Performance Testing utilizes the [Sitespeed.io container](https://h
``` ```
<<<<<<< HEAD <<<<<<< HEAD
In GitLab Enterprise Edition 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). 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" >>>>>>> bfab3990f8c... search and replace "Premium" => "Premium"
### Auto Deploy ### Auto Deploy
......
...@@ -161,7 +161,7 @@ this can be changed within the group settings for a group, or the default settin ...@@ -161,7 +161,7 @@ this can be changed within the group settings for a group, or the default settin
changed within the Admin area (`Settings`, `Visibility and Access Controls`). This changed within the Admin area (`Settings`, `Visibility and Access Controls`). This
can be `None`, `Masters`, or `Developers + Masters`. can be `None`, `Masters`, or `Developers + Masters`.
It is available only in [GitLab Enterprise Edition Premium][eep]. It is available only in [GitLab Premium][eep].
## Transfer projects into groups ## Transfer projects into groups
......
...@@ -196,7 +196,7 @@ by an administrator under **Admin > Application Settings**. ...@@ -196,7 +196,7 @@ by an administrator under **Admin > Application Settings**.
## Auditor users ## Auditor users
>[Introduced][ee-998] in [GitLab Enterprise Edition Premium][eep] 8.17. >[Introduced][ee-998] in [GitLab Premium][eep] 8.17.
Auditor users are given read-only access to all projects, groups, and other Auditor users are given read-only access to all projects, groups, and other
resources on the GitLab instance. resources on the GitLab instance.
......
# Canary Deployments # Canary Deployments
> [Introduced][ee-1659] in [GitLab Enterprise Edition Premium][eep] 9.1. > [Introduced][ee-1659] in [GitLab Premium][eep] 9.1.
A popular [Continuous Integration](https://en.wikipedia.org/wiki/Continuous_integration) A popular [Continuous Integration](https://en.wikipedia.org/wiki/Continuous_integration)
strategy, where a small portion of the fleet is updated to the new version of strategy, where a small portion of the fleet is updated to the new version of
......
# Deploy Boards # Deploy Boards
> [Introduced][ee-1589] in [GitLab Enterprise Edition Premium][ee] 9.0. > [Introduced][ee-1589] in [GitLab Premium][ee] 9.0.
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] running on [Kubernetes], displaying the status status of each CI [environment] running on [Kubernetes], displaying the status
......
# File Locking # File Locking
>**Notes:** >**Notes:**
- [Introduced][ee-440] in [GitLab Enterprise Edition Premium][ee] 8.9. - [Introduced][ee-440] in [GitLab Premium][ee] 8.9.
- This feature needs to have a license with the "File Lock" option enabled. If - This feature needs to have a license with the "File Lock" option enabled. If
you are using Enterprise Edition Premium but you don't see the "Lock" button, you are using Premium but you don't see the "Lock" button,
ask your GitLab administrator. ask your GitLab administrator.
File Locking helps you avoid merge conflicts and better manage your binary files. File Locking helps you avoid merge conflicts and better manage your binary files.
...@@ -14,7 +14,7 @@ member of the team can edit it. ...@@ -14,7 +14,7 @@ member of the team can edit it.
Working with multiple people on the same file can be a risk. Conflicts Working with multiple people on the same file can be a risk. Conflicts
when merging a non-text file are hard to overcome and will require a lot when merging a non-text file are hard to overcome and will require a lot
of manual work to resolve. With GitLab Enterprise Edition Premium, File of manual work to resolve. With GitLab Premium, File
Locking helps you avoid merge conflicts and better manage your binary Locking helps you avoid merge conflicts and better manage your binary
files by preventing everyone, except you, from modifying a specific file files by preventing everyone, except you, from modifying a specific file
or entire directory. or entire directory.
......
...@@ -43,7 +43,7 @@ Enable [Service Desk](../service_desk.md) to your project and offer email suppor ...@@ -43,7 +43,7 @@ Enable [Service Desk](../service_desk.md) to your project and offer email suppor
By doing so, when your customer sends a new email, a new issue can be created in By doing so, when your customer sends a new email, a new issue can be created in
the appropriate project and followed up from there. the appropriate project and followed up from there.
_Service Desk is available only for [GitLab Enterprise Edition Premium](https://about.gitlab.com/gitlab-ee/) _Service Desk is available only for [GitLab Premium](https://about.gitlab.com/gitlab-ee/)
and [GitLab.com Silver](https://about.gitlab.com/gitlab-com/) subscribers._ and [GitLab.com Silver](https://about.gitlab.com/gitlab-com/) subscribers._
## New issue from the group-level Issue Tracker ## New issue from the group-level Issue Tracker
......
# Browser Performance Testing # Browser Performance Testing
> [Introduced](https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3507) in [GitLab Enterprise Edition Premium](https://about.gitlab.com/gitlab-ee/) 10.3. > [Introduced](https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3507) in [GitLab Premium](https://about.gitlab.com/gitlab-ee/) 10.3.
## Overview ## Overview
......
...@@ -31,11 +31,11 @@ With GitLab merge requests, you can: ...@@ -31,11 +31,11 @@ With GitLab merge requests, you can:
With **[GitLab Enterprise Edition][ee]**, you can also: With **[GitLab Enterprise Edition][ee]**, you can also:
- View the deployment process across projects with [Multi-Project Pipeline Graphs](../../../ci/multi_project_pipeline_graphs.md) (available only in GitLab Enterprise Edition Premium) - View the deployment process across projects with [Multi-Project Pipeline Graphs](../../../ci/multi_project_pipeline_graphs.md) (available only in GitLab Premium)
- Request [approvals](#merge-request-approvals) from your managers (available in GitLab Starter) - Request [approvals](#merge-request-approvals) from your managers (available in GitLab Starter)
- [Squash and merge](#squash-and-merge) for a cleaner commit history (available in GitLab Starter) - [Squash and merge](#squash-and-merge) for a cleaner commit history (available in GitLab Starter)
- Analyze the impact of your changes with [Code Quality reports](#code-quality-reports) (available in GitLab Starter) - Analyze the impact of your changes with [Code Quality reports](#code-quality-reports) (available in GitLab Starter)
- Determine the performance impact of changes with [Browser Performance Testing](#browser-performance-testing) (available in GitLab Enterprise Edition Premium) - Determine the performance impact of changes with [Browser Performance Testing](#browser-performance-testing) (available in GitLab Premium)
## Use cases ## Use cases
...@@ -223,7 +223,7 @@ merge request widget area. ...@@ -223,7 +223,7 @@ merge request widget area.
## Browser Performance Testing ## Browser Performance Testing
> Introduced in [GitLab Enterprise Edition Premium][products] 10.3. > Introduced in [GitLab Premium][products] 10.3.
If your application offers a web interface and you are using [GitLab CI/CD][ci], you can quickly determine the performance impact of pending code changes. GitLab uses [Sitespeed.io][sitespeed], a free and open source tool for measuring the performance of web sites, to analyze the performance of specific pages. If your application offers a web interface and you are using [GitLab CI/CD][ci], you can quickly determine the performance impact of pending code changes. GitLab uses [Sitespeed.io][sitespeed], a free and open source tool for measuring the performance of web sites, to analyze the performance of specific pages.
......
# Service Desk # Service Desk
> [Introduced][ee-149] in [GitLab Enterprise Edition Premium 9.1][eep-9.1]. > [Introduced][ee-149] in [GitLab Premium 9.1][eep-9.1].
## Overview ## Overview
...@@ -57,7 +57,7 @@ you can skip the step 1 below; you only need to enable it per project. ...@@ -57,7 +57,7 @@ you can skip the step 1 below; you only need to enable it per project.
support [email sub-addressing][email-sub-addressing]. support [email sub-addressing][email-sub-addressing].
2. Navigate to your project's **Settings** and scroll down to the **Service Desk** 2. Navigate to your project's **Settings** and scroll down to the **Service Desk**
section. section.
3. If you have the correct access and an Enterprise Edition Premium license, 3. If you have the correct access and an Premium license,
you will see an option to set up Service Desk: you will see an option to set up Service Desk:
![Activate Service Desk option](img/service_desk_disabled.png) ![Activate Service Desk option](img/service_desk_disabled.png)
......
...@@ -47,7 +47,7 @@ In `config/gitlab.yml`: ...@@ -47,7 +47,7 @@ In `config/gitlab.yml`:
## Setting up S3 compatible object storage ## Setting up S3 compatible object storage
> **Note:** [Introduced][ee-2760] in [GitLab Enterprise Edition Premium][eep] 10.0. > **Note:** [Introduced][ee-2760] in [GitLab Premium][eep] 10.0.
It is possible to store LFS objects on remote object storage instead of on a local disk. It is possible to store LFS objects on remote object storage instead of on a local disk.
...@@ -161,5 +161,5 @@ and [projects APIs](../../api/projects.md). ...@@ -161,5 +161,5 @@ and [projects APIs](../../api/projects.md).
[reconfigure gitlab]: ../../administration/restart_gitlab.md#omnibus-gitlab-reconfigure "How to reconfigure Omnibus GitLab" [reconfigure gitlab]: ../../administration/restart_gitlab.md#omnibus-gitlab-reconfigure "How to reconfigure Omnibus GitLab"
[restart gitlab]: ../../administration/restart_gitlab.md#installations-from-source "How to restart GitLab" [restart gitlab]: ../../administration/restart_gitlab.md#installations-from-source "How to restart GitLab"
[eep]: https://about.gitlab.com/gitlab-ee/ "GitLab Enterprise Edition Premium" [eep]: https://about.gitlab.com/gitlab-ee/ "GitLab Premium"
[ee-2760]: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2760 [ee-2760]: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2760
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