diff options
| author | Evan Read <eread@gitlab.com> | 2019-06-04 05:37:31 +0000 |
|---|---|---|
| committer | Evan Read <eread@gitlab.com> | 2019-06-04 05:37:31 +0000 |
| commit | 0923456678e1a9c1b20279693a9cdd3e421a0fd8 (patch) | |
| tree | 6eac1b51f2c4f493159c648d88da9b779e0be3cb | |
| parent | c4effa86d8607026a74d6c49130f4092005fab2a (diff) | |
| parent | 877e4e1e7b670db1c4275ef091980c76645fdfba (diff) | |
| download | gitlab-ce-0923456678e1a9c1b20279693a9cdd3e421a0fd8.tar.gz | |
Merge branch 'docs/ssot_admin_area_third_party_offers' into 'master'
Edited `Third Party Offers` for SSOT guidelines
See merge request gitlab-org/gitlab-ce!29103
| -rw-r--r-- | doc/user/admin_area/settings/third_party_offers.md | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/doc/user/admin_area/settings/third_party_offers.md b/doc/user/admin_area/settings/third_party_offers.md index 23311801790..d3c9cf7d8ff 100644 --- a/doc/user/admin_area/settings/third_party_offers.md +++ b/doc/user/admin_area/settings/third_party_offers.md @@ -1,9 +1,26 @@ +--- +type: reference +--- + # Third party offers > [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20379) > in [GitLab Core](https://about.gitlab.com/pricing/) 11.1 -Within GitLab, we inform users of available third-party offers they might find valuable in order to enhance the development of their projects. -An example is the Google Cloud Platform free credit for using [Google Kubernetes Engine](https://cloud.google.com/kubernetes-engine/). +Within GitLab, we inform users of available third-party offers they might find valuable in order +to enhance the development of their projects. An example is the Google Cloud Platform free credit +for using [Google Kubernetes Engine](https://cloud.google.com/kubernetes-engine/). + +The display of third-party offers can be toggled in the **Admin Area > Settings** page. + +<!-- ## Troubleshooting + +Include any troubleshooting steps that you can foresee. If you know beforehand what issues +one might have when setting this up, or when something is changed, or on upgrading, it's +important to describe those, too. Think of things that may go wrong and include them here. +This is important to minimize requests for support, and to avoid doc comments with +questions that you know someone might ask. -The display of third-party offers can be toggled in the Admin area on the Settings page. +Each scenario can be a third-level heading, e.g. `### Getting error message X`. +If you have none to add when creating a doc, leave this section in place +but commented out to help encourage others to add to it in the future. --> |