Commit e1fccfff authored by Marcel Amirault's avatar Marcel Amirault Committed by Fiona Neill

Clean up whitespace in docs

parent 5c86fc75
...@@ -82,7 +82,7 @@ The final comment in the issue **has to have**: ...@@ -82,7 +82,7 @@ The final comment in the issue **has to have**:
## Example ## Example
User configuration available in `/etc/gitlab/gitlab.rb` was introduced in GitLab version 10.0, `gitlab_rails['configuration'] = true`. In GitLab version 10.4.0, a new change was introduced that requires rename of this configuration option. New configuration option is `gitlab_rails['better_configuration'] = true`. Development team translates the old configuration into a new one User configuration available in `/etc/gitlab/gitlab.rb` was introduced in GitLab version 10.0, `gitlab_rails['configuration'] = true`. In GitLab version 10.4.0, a new change was introduced that requires rename of this configuration option. New configuration option is `gitlab_rails['better_configuration'] = true`. Development team translates the old configuration into a new one
and triggers a deprecation procedure. and triggers a deprecation procedure.
This means that these two configuration This means that these two configuration
......
...@@ -379,7 +379,7 @@ By default artifacts are always kept for the most recent successful pipeline for ...@@ -379,7 +379,7 @@ By default artifacts are always kept for the most recent successful pipeline for
each ref. This means that the latest artifacts do not immediately expire according each ref. This means that the latest artifacts do not immediately expire according
to the `expire_in` specification. to the `expire_in` specification.
If a new pipeline for the same ref completes successfully, the previous pipeline's If a new pipeline for the same ref completes successfully, the previous pipeline's
artifacts are deleted according to the `expire_in` configuration. The artifacts artifacts are deleted according to the `expire_in` configuration. The artifacts
of the new pipeline are kept automatically. of the new pipeline are kept automatically.
......
...@@ -181,9 +181,9 @@ to integrate GitLab and Jenkins. ...@@ -181,9 +181,9 @@ to integrate GitLab and Jenkins.
### Error during GitLab configuration - "Connection failed. Please check your settings" ### Error during GitLab configuration - "Connection failed. Please check your settings"
If you get this error message while configuring GitLab, the following are possible causes: If you get this error message while configuring GitLab, the following are possible causes:
- GitLab is unable to reach your Jenkins instance at the address. If your GitLab instance is self-managed, try pinging the - GitLab is unable to reach your Jenkins instance at the address. If your GitLab instance is self-managed, try pinging the
Jenkins instance at the domain provided on the GitLab instance. Jenkins instance at the domain provided on the GitLab instance.
- The Jenkins instance is at a local address and is not included in the - The Jenkins instance is at a local address and is not included in the
[GitLab installation's allowlist](../security/webhooks.md#allowlist-for-local-requests). [GitLab installation's allowlist](../security/webhooks.md#allowlist-for-local-requests).
......
...@@ -194,7 +194,7 @@ To set a limit on how long these sessions are valid: ...@@ -194,7 +194,7 @@ To set a limit on how long these sessions are valid:
## Limit the lifetime of SSH keys **(ULTIMATE SELF)** ## Limit the lifetime of SSH keys **(ULTIMATE SELF)**
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/1007) in GitLab 14.6 [with a flag](../../../administration/feature_flags.md) named `ff_limit_ssh_key_lifetime`. Disabled by default. > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/1007) in GitLab 14.6 [with a flag](../../../administration/feature_flags.md) named `ff_limit_ssh_key_lifetime`. Disabled by default.
> - [Enabled on self-managed](https://gitlab.com/gitlab-org/gitlab/-/issues/346753) in GitLab 14.6. > - [Enabled on self-managed](https://gitlab.com/gitlab-org/gitlab/-/issues/346753) in GitLab 14.6.
FLAG: FLAG:
......
...@@ -1302,7 +1302,7 @@ Please use `~"Category:API Security"` [label](../../../development/contributing/ ...@@ -1302,7 +1302,7 @@ Please use `~"Category:API Security"` [label](../../../development/contributing/
[Search the issue tracker](https://gitlab.com/gitlab-org/gitlab/-/issues) for similar entries before submitting your own, there's a good chance somebody else had the same issue or feature proposal. Show your support with an award emoji and or join the discussion. [Search the issue tracker](https://gitlab.com/gitlab-org/gitlab/-/issues) for similar entries before submitting your own, there's a good chance somebody else had the same issue or feature proposal. Show your support with an award emoji and or join the discussion.
When experiencing a behavior not working as expected, consider providing contextual information: When experiencing a behavior not working as expected, consider providing contextual information:
- GitLab version if using a self-managed instance. - GitLab version if using a self-managed instance.
- `.gitlab-ci.yml` job definition. - `.gitlab-ci.yml` job definition.
......
...@@ -1218,7 +1218,7 @@ Please use `~"Category:API Security"` [label](../../../development/contributing/ ...@@ -1218,7 +1218,7 @@ Please use `~"Category:API Security"` [label](../../../development/contributing/
[Search the issue tracker](https://gitlab.com/gitlab-org/gitlab/-/issues) for similar entries before submitting your own, there's a good chance somebody else had the same issue or feature proposal. Show your support with an award emoji and or join the discussion. [Search the issue tracker](https://gitlab.com/gitlab-org/gitlab/-/issues) for similar entries before submitting your own, there's a good chance somebody else had the same issue or feature proposal. Show your support with an award emoji and or join the discussion.
When experiencing a behavior not working as expected, consider providing contextual information: When experiencing a behavior not working as expected, consider providing contextual information:
- GitLab version if using a self-managed instance. - GitLab version if using a self-managed instance.
- `.gitlab-ci.yml` job definition. - `.gitlab-ci.yml` job definition.
......
...@@ -47,7 +47,7 @@ classDiagram ...@@ -47,7 +47,7 @@ classDiagram
class Issue class Issue
Epic *-- "0..7" Epic Epic *-- "0..7" Epic
Epic "1" *-- "0..*" Issue Epic "1"*-- "0..*" Issue
``` ```
--> -->
......
This diff is collapsed.
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