Commit 1873e4c1 authored by Achilleas Pipinellis's avatar Achilleas Pipinellis

Merge branch 'docs/fix-introduced-in-text' into 'master'

Fixes Introduced in text for our renderer

See merge request gitlab-org/gitlab-ce!32308
parents fb276565 59847ef0
# PlantUML & GitLab # PlantUML & GitLab
> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8537) in > [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8537) in GitLab 8.16.
> GitLab 8.16.
When [PlantUML](http://plantuml.com) integration is enabled and configured in When [PlantUML](http://plantuml.com) integration is enabled and configured in
GitLab we are able to create simple diagrams in AsciiDoc and Markdown documents GitLab we are able to create simple diagrams in AsciiDoc and Markdown documents
......
...@@ -156,8 +156,7 @@ An admin can enable/disable a specific Runner for projects: ...@@ -156,8 +156,7 @@ An admin can enable/disable a specific Runner for projects:
## Protected Runners ## Protected Runners
> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13194) > [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13194) in GitLab 10.0.
> in GitLab 10.0.
You can protect Runners from revealing sensitive information. You can protect Runners from revealing sensitive information.
Whenever a Runner is protected, the Runner picks only jobs created on Whenever a Runner is protected, the Runner picks only jobs created on
......
...@@ -1899,9 +1899,8 @@ job1: ...@@ -1899,9 +1899,8 @@ job1:
### `retry` ### `retry`
> [Introduced][ce-12909] in GitLab 9.5. > - [Introduced][ce-12909] in GitLab 9.5.
> [Behaviour expanded](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/21758) > - [Behaviour expanded](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/21758) in GitLab 11.5 to control on which failures to retry.
> in GitLab 11.5 to control on which failures to retry.
`retry` allows you to configure how many times a job is going to be retried in `retry` allows you to configure how many times a job is going to be retried in
case of a failure. case of a failure.
......
...@@ -4,8 +4,7 @@ type: reference ...@@ -4,8 +4,7 @@ type: reference
# Enforce accepting Terms of Service **(CORE ONLY)** # Enforce accepting Terms of Service **(CORE ONLY)**
> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18570) > [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18570) in [GitLab Core](https://about.gitlab.com/pricing/) 10.8.
> in [GitLab Core](https://about.gitlab.com/pricing/) 10.8
An admin can enforce acceptance of a terms of service and privacy policy. When this option is enabled, new and existing users must accept the terms. An admin can enforce acceptance of a terms of service and privacy policy. When this option is enabled, new and existing users must accept the terms.
......
...@@ -4,8 +4,7 @@ type: reference ...@@ -4,8 +4,7 @@ type: reference
# Third party offers **(CORE ONLY)** # Third party offers **(CORE ONLY)**
> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20379) > [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20379) in [GitLab Core](https://about.gitlab.com/pricing/) 11.1.
> 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 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 to enhance the development of their projects. An example is the Google Cloud Platform free credit
......
...@@ -225,8 +225,7 @@ file. ...@@ -225,8 +225,7 @@ file.
## Upgrading applications ## Upgrading applications
> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24789) > [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24789) in GitLab 11.8.
in GitLab 11.8.
The applications below can be upgraded. The applications below can be upgraded.
......
...@@ -19,7 +19,7 @@ Once enabled, GitLab will automatically detect metrics from known services in th ...@@ -19,7 +19,7 @@ Once enabled, GitLab will automatically detect metrics from known services in th
### Managed Prometheus on Kubernetes ### Managed Prometheus on Kubernetes
> **Note**: [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/28916) in GitLab 10.5 > [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/28916) in GitLab 10.5.
GitLab can seamlessly deploy and manage Prometheus on a [connected Kubernetes cluster](../clusters/index.md), making monitoring of your apps easy. GitLab can seamlessly deploy and manage Prometheus on a [connected Kubernetes cluster](../clusters/index.md), making monitoring of your apps easy.
...@@ -271,7 +271,7 @@ Note the following properties: ...@@ -271,7 +271,7 @@ Note the following properties:
### Downloading data as CSV ### Downloading data as CSV
Data from Prometheus charts on the metrics dashboard can be downloaded as CSV. Data from Prometheus charts on the metrics dashboard can be downloaded as CSV.
![Downloading as CSV](img/download_as_csv.png) ![Downloading as CSV](img/download_as_csv.png)
...@@ -342,15 +342,21 @@ If the metric exceeds the threshold of the alert for over 5 minutes, an email wi ...@@ -342,15 +342,21 @@ If the metric exceeds the threshold of the alert for over 5 minutes, an email wi
## Determining the performance impact of a merge ## Determining the performance impact of a merge
> [Introduced][ce-10408] in GitLab 9.2. > - [Introduced][ce-10408] in GitLab 9.2.
> GitLab 9.3 added the [numeric comparison](https://gitlab.com/gitlab-org/gitlab-ce/issues/27439) of the 30 minute averages. > - GitLab 9.3 added the [numeric comparison](https://gitlab.com/gitlab-org/gitlab-ce/issues/27439) of the 30 minute averages.
> Requires [Kubernetes](prometheus_library/kubernetes.md) metrics
Developers can view the performance impact of their changes within the merge Developers can view the performance impact of their changes within the merge
request workflow. When a source branch has been deployed to an environment, a sparkline and numeric comparison of the average memory consumption will appear. On the sparkline, a dot request workflow.
indicates when the current changes were deployed, with up to 30 minutes of
performance data displayed before and after. The comparison shows the difference between the 30 minute average before and after the deployment. This information is updated after NOTE: **Note:**
each commit has been deployed. Requires [Kubernetes](prometheus_library/kubernetes.md) metrics.
When a source branch has been deployed to an environment, a sparkline and
numeric comparison of the average memory consumption will appear. On the
sparkline, a dot indicates when the current changes were deployed, with up to 30 minutes of
performance data displayed before and after. The comparison shows the difference
between the 30 minute average before and after the deployment. This information
is updated after each commit has been deployed.
Once merged and the target branch has been redeployed, the metrics will switch Once merged and the target branch has been redeployed, the metrics will switch
to show the new environments this revision has been deployed to. to show the new environments this revision has been deployed to.
...@@ -363,13 +369,15 @@ Prometheus server. ...@@ -363,13 +369,15 @@ Prometheus server.
## Embedding metric charts within GitLab Flavored Markdown ## Embedding metric charts within GitLab Flavored Markdown
> [Introduced][ce-29691] in GitLab 12.2. > [Introduced][ce-29691] in GitLab 12.2.
> Requires [Kubernetes](prometheus_library/kubernetes.md) metrics.
It is possible to display metrics charts within [GitLab Flavored Markdown](../../markdown.md#gitlab-flavored-markdown-gfm). It is possible to display metrics charts within [GitLab Flavored Markdown](../../markdown.md#gitlab-flavored-markdown-gfm).
NOTE: **Note:**
Requires [Kubernetes](prometheus_library/kubernetes.md) metrics.
To display a metric chart, include a link of the form `https://<root_url>/<project>/environments/<environment_id>/metrics`. To display a metric chart, include a link of the form `https://<root_url>/<project>/environments/<environment_id>/metrics`.
A single chart may also be embedded. You can generate a link to the chart via the dropdown located on the right side of the chart: A single chart may also be embedded. You can generate a link to the chart via the dropdown located on the right side of the chart:
![Generate Link To Chart](img/generate_link_to_chart.png) ![Generate Link To Chart](img/generate_link_to_chart.png)
......
# Issue Weight **(STARTER)** # Issue weight **(STARTER)**
> [Introduced](https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/76) > [Introduced](https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/76) in [GitLab Starter](https://about.gitlab.com/pricing/) 8.3.
> in [GitLab Starter](https://about.gitlab.com/pricing/) 8.3.
When you have a lot of issues, it can be hard to get an overview. When you have a lot of issues, it can be hard to get an overview.
By adding a weight to each issue, you can get a better idea of how much time, By adding a weight to each issue, you can get a better idea of how much time,
......
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