Commit 6d49d673 authored by Amy Qualls's avatar Amy Qualls

Merge branch 'msj-nav-template' into 'master'

Fix Service Desk capitalization and change an EE-only feature example

See merge request gitlab-org/gitlab!37714
parents 2124d7e4 00dca0ca
......@@ -1228,7 +1228,7 @@ PUT /projects/:id
| `only_mirror_protected_branches` | boolean | no | **(STARTER)** Only mirror protected branches |
| `mirror_overwrites_diverged_branches` | boolean | no | **(STARTER)** Pull mirror overwrites diverged branches |
| `packages_enabled` | boolean | no | Enable or disable packages repository feature |
| `service_desk_enabled` | boolean | no | Enable or disable service desk feature |
| `service_desk_enabled` | boolean | no | Enable or disable Service Desk feature |
NOTE: **Note:**
If your HTTP repository is not publicly accessible,
......
......@@ -304,9 +304,9 @@ Examples:
# does not include index.html at the end
docs:
- doc_title: Service Desk
doc_url: 'user/project/service_desk.html'
ee_only: false
- doc_title: Container Scanning
doc_url: 'user/application_security/container_scanning/'
ee_only: true
# note that the URL above ends in html and, as the
# document is EE-only, the attribute ee_only is set to true.
```
......
......@@ -8,7 +8,7 @@ on-premise or GitLab.com plans and features.
GitLab.com plans are persisted on user groups and namespaces, therefore, if you're adding a
feature such as [Related issues](../user/project/issues/related_issues.md) or
[Service desk](../user/project/service_desk.md),
[Service Desk](../user/project/service_desk.md),
it should be restricted on namespace scope.
1. Add the feature symbol on `EES_FEATURES`, `EEP_FEATURES` or `EEU_FEATURES` constants in
......
......@@ -111,7 +111,7 @@ The **Thank you email** is the email sent to a user after they submit an issue.
The file name of the template has to be `thank_you.md`.
You can use `%{ISSUE_ID}` placeholder which will be replaced by an issue IID in the email and
`%{ISSUE_PATH}` placeholder which will be replaced by project path and the issue IID.
As the service desk issues are created as confidential (only project members can see them)
As the Service Desk issues are created as confidential (only project members can see them)
the response email does not provide the issue link.
#### New note email
......
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