Commit 153f25af authored by Evan Read's avatar Evan Read

Merge branch 'docs-markdown-fixes' into 'master'

Fix broken markdown in various docs

See merge request gitlab-org/gitlab-ce!32440
parents bfdb41be 03b152c5
...@@ -175,7 +175,7 @@ job: ...@@ -175,7 +175,7 @@ job:
### Inherit global config, but override specific settings per job ### Inherit global config, but override specific settings per job
You can override cache settings without overwriting the global cache by using You can override cache settings without overwriting the global cache by using
[anchors](../yaml/README.md#anchors). For example, if you want to override the [anchors](../yaml/README.md#anchors). For example, if you want to override the
`policy` for one job: `policy` for one job:
```yaml ```yaml
......
...@@ -1989,6 +1989,7 @@ Marking a job to be run in parallel requires only a simple addition to your conf ...@@ -1989,6 +1989,7 @@ Marking a job to be run in parallel requires only a simple addition to your conf
script: rspec script: rspec
+ parallel: 5 + parallel: 5
``` ```
TIP: **Tip:** TIP: **Tip:**
Parallelize tests suites across parallel jobs. Parallelize tests suites across parallel jobs.
Different languages have different tools to facilitate this. Different languages have different tools to facilitate this.
......
...@@ -106,7 +106,7 @@ Stage labels specify which [stage](https://about.gitlab.com/handbook/product/cat ...@@ -106,7 +106,7 @@ Stage labels specify which [stage](https://about.gitlab.com/handbook/product/cat
Stage labels respects the `devops::<stage_key>` naming convention. Stage labels respects the `devops::<stage_key>` naming convention.
`<stage_key>` is the stage key as it is in the single source of truth for stages at `<stage_key>` is the stage key as it is in the single source of truth for stages at
<https://gitlab.com/gitlab-com/www-gitlab-com/blob/master/data/stages.yml> <https://gitlab.com/gitlab-com/www-gitlab-com/blob/master/data/stages.yml>
with `_` replaced with ` `. with `_` replaced with a space.
For instance, the "Manage" stage is represented by the ~"devops::manage" label in For instance, the "Manage" stage is represented by the ~"devops::manage" label in
the `gitlab-org` group since its key under `stages` is `manage`. the `gitlab-org` group since its key under `stages` is `manage`.
...@@ -132,7 +132,7 @@ Group labels respects the `group::<group_key>` naming convention and ...@@ -132,7 +132,7 @@ Group labels respects the `group::<group_key>` naming convention and
their color is `#A8D695`. their color is `#A8D695`.
`<group_key>` is the group key as it is in the single source of truth for groups at `<group_key>` is the group key as it is in the single source of truth for groups at
<https://gitlab.com/gitlab-com/www-gitlab-com/blob/master/data/stages.yml>, <https://gitlab.com/gitlab-com/www-gitlab-com/blob/master/data/stages.yml>,
with `_` replaced with ` `. with `_` replaced with a space.
For instance, the "Continuous Integration" group is represented by the For instance, the "Continuous Integration" group is represented by the
~"group::continuous integration" label in the `gitlab-org` group since its key ~"group::continuous integration" label in the `gitlab-org` group since its key
......
...@@ -726,7 +726,7 @@ instead of the default `ruby:latest`: ...@@ -726,7 +726,7 @@ instead of the default `ruby:latest`:
NOTE: **Note:** NOTE: **Note:**
Passing in complex values (newlines and spaces, for example) will likely Passing in complex values (newlines and spaces, for example) will likely
cause escaping issues due to the way this argument is used in Auto DevOps. cause escaping issues due to the way this argument is used in Auto DevOps.
Consider using Base64 encoding of such values to avoid this problem. Consider using Base64 encoding of such values to avoid this problem.
CAUTION: **Warning:** CAUTION: **Warning:**
......
...@@ -63,7 +63,7 @@ Once you're on the dashboard, at the top you should see a series of filters for: ...@@ -63,7 +63,7 @@ Once you're on the dashboard, at the top you should see a series of filters for:
- Project - Project
NOTE: **Note:** NOTE: **Note:**
The dashboard only shows projects with [security reports](#supported-reports) enabled in a group. The dashboard only shows projects with [security reports](#supported-reports) enabled in a group.
![dashboard with action buttons and metrics](img/group_security_dashboard.png) ![dashboard with action buttons and metrics](img/group_security_dashboard.png)
......
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