diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-07 00:09:19 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-07 00:09:19 +0300 |
commit | 7915c41e4261719719e791602c8235574157164c (patch) | |
tree | 6c1fc8c4ad4e974878c879fcc2c7c8f7d56d0cee /doc/user | |
parent | 495c22d1245b6212b21b7379a542df73dfa77206 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user')
-rw-r--r-- | doc/user/admin_area/settings/usage_statistics.md | 2 | ||||
-rw-r--r-- | doc/user/asciidoc.md | 11 |
2 files changed, 13 insertions, 0 deletions
diff --git a/doc/user/admin_area/settings/usage_statistics.md b/doc/user/admin_area/settings/usage_statistics.md index 9e7fae05be7..cbfdf2d188c 100644 --- a/doc/user/admin_area/settings/usage_statistics.md +++ b/doc/user/admin_area/settings/usage_statistics.md @@ -327,6 +327,8 @@ but commented out to help encourage others to add to it in the future. --> |dependency_scanning_jobs|counts|| |license_management_jobs|counts|| |sast_jobs|counts|| +|status_page_projects|counts|monitor| +|status_page_issues|counts|monitor| |epics_deepest_relationship_level|counts|| |operations_dashboard_default_dashboard|counts|| |operations_dashboard_users_with_projects_added|counts|| diff --git a/doc/user/asciidoc.md b/doc/user/asciidoc.md index c35d1da5a88..8834deb8d50 100644 --- a/doc/user/asciidoc.md +++ b/doc/user/asciidoc.md @@ -91,6 +91,8 @@ stem:[sqrt(4) = 2] ### Attributes +**User-defined attributes** + ```asciidoc // define attributes in the document header :name: value @@ -104,6 +106,15 @@ C{pp} is not required, only Ruby. Use a leading backslash to output a word enclosed in curly braces, like \{name}. ``` +**Environment attributes** + +GitLab sets the following environment attributes: + +| Attribute | Description | +| :-------------- | :--------------------------------------------------------------------------------------------------------------------- | +| `docname` | Root name of the source document (no leading path or file extension). | +| `outfilesuffix` | File extension corresponding to the backend output (defaults to `.adoc` to make inter-document cross references work). | + ### Links ```asciidoc |