Commit 9143fda7 authored by Marcel Amirault's avatar Marcel Amirault

Merge branch 'russell/remove-trailing-spaces-round2' into 'master'

Removed trailing spaces from docs source files

See merge request gitlab-org/gitlab!45481
parents 105dc62a 57e500e0
......@@ -180,7 +180,7 @@ docker login gitlab.example.com:5050
### Configure Container Registry under its own domain
When the Registry is configured to use its own domain, you need a TLS
certificate for that specific domain (for example, `registry.example.com`). You might need
certificate for that specific domain (for example, `registry.example.com`). You might need
a wildcard certificate if hosted under a subdomain of your existing GitLab
domain, for example, `registry.gitlab.example.com`.
......
......@@ -64,7 +64,7 @@ is the same as [getting the job's artifacts](#get-job-artifacts), but by
defining the job's name instead of its ID.
NOTE: **Note:**
If a pipeline is [parent of other child pipelines](../ci/parent_child_pipelines.md), artifacts
If a pipeline is [parent of other child pipelines](../ci/parent_child_pipelines.md), artifacts
are searched in hierarchical order from parent to child. For example, if both parent and
child pipelines have a job with the same name, the artifact from the parent pipeline will be returned.
......
......@@ -1007,7 +1007,7 @@ order for it to take effect:
value of zero disables approvals for that project.
1. The provided value of `approvals_before_merge` must be greater than the
target project's `approvals_before_merge`.
1. This API returns 201 (created) for a successful response.
1. This API returns 201 (created) for a successful response.
```json
{
......
......@@ -222,7 +222,7 @@ curl --request POST "https://gitlab.example.com/api/v4/snippets" \
```json
{
"title": "This is a snippet",
"title": "This is a snippet",
"description": "Hello World snippet",
"visibility": "internal",
"files": [
......@@ -310,10 +310,10 @@ curl --request PUT "https://gitlab.example.com/api/v4/snippets/1" \
```json
{
"title": "foo",
"title": "foo",
"files": [
{
"action": "move",
"action": "move",
"previous_path": "test.txt",
"file_path": "renamed.md"
}
......
......@@ -9,7 +9,7 @@ type: howto
Interacting with a major cloud provider may have become a much needed task that's
part of your delivery process. With GitLab you can
[deploy your application anywhere](https://about.gitlab.com/stages-devops-lifecycle/deploy-targets/).
[deploy your application anywhere](https://about.gitlab.com/stages-devops-lifecycle/deploy-targets/).
For some specific deployment targets, GitLab makes this process less painful by providing Docker images
that come with the needed libraries and tools pre-installed.
......
......@@ -225,7 +225,7 @@ In the upstream pipeline:
1. Save the variables in a `.env` file.
1. Save the `.env` file as a `dotenv` report.
1. Trigger the downstream pipeline.
1. Trigger the downstream pipeline.
```yaml
build_vars:
......
......@@ -2613,7 +2613,7 @@ The `stop_review_app` job is **required** to have the following keywords defined
- `environment:action`
Additionally, both jobs should have matching [`rules`](../yaml/README.md#onlyexcept-basic)
or [`only/except`](../yaml/README.md#onlyexcept-basic) configuration.
or [`only/except`](../yaml/README.md#onlyexcept-basic) configuration.
In the example above, if the configuration is not identical:
......@@ -4409,7 +4409,7 @@ You can use the `$CI_COMMIT_REF_SLUG` variable to specify your [`cache:key`](#ca
For example, if your `$CI_COMMIT_REF_SLUG` is `test` you can set a job
to download cache that's tagged with `test`.
If a cache with this tag is not found, you can use `CACHE_FALLBACK_KEY` to
If a cache with this tag is not found, you can use `CACHE_FALLBACK_KEY` to
specify a cache to use when none exists.
For example:
......
......@@ -22,7 +22,7 @@ with updates(obj_id, new_title, new_weight) as (
values (1 :: integer, 'Very difficult issue' :: text, 8 :: integer),
(2, 'Very easy issue', 1)
)
update issues
update issues
set title = new_title, weight = new_weight
from updates
where id = obj_id
......@@ -88,7 +88,7 @@ objects = Foo.from_union([
# At this point, all the objects are instances of Foo, even the ones from the
# Bar table
mapping = objects.to_h { |obj| [obj, bazzes[obj.id] }
# Issues at most 2 queries
::Gitlab::Database::BulkUpdate.execute(%i[baz], mapping) do |obj|
obj.object_type.constantize
......
......@@ -11,7 +11,7 @@ type: howto
When [Require admin approval for new sign-ups](settings/sign_up_restrictions.md#require-admin-approval-for-new-sign-ups) is enabled, any user that signs up for an account using the registration form is placed under a **Pending approval** state.
A user pending approval is functionally identical to a [blocked](blocking_unblocking_users.md) user.
A user pending approval is functionally identical to a [blocked](blocking_unblocking_users.md) user.
A user pending approval:
......
......@@ -177,7 +177,7 @@ You can also consult the [group permissions table](../../permissions.md#group-me
Once you write your comment, you can either:
- Click **Comment** to publish your comment.
- Click **Comment** to publish your comment.
- Click **Start thread** to start a thread within that epic's discussion.
### Activity sort order
......
......@@ -136,7 +136,7 @@ Install a package from the Package Registry so you can use it as a dependency.
Prerequisites:
- A package in the Package Registry.
- The group ID, which is on the group's home page.
- The group ID, which is on the group's home page.
- A [personal access token](../../../user/profile/personal_access_tokens.md) with the scope set to, at minimum, `read_api`.
NOTE: **Note:**
......@@ -155,7 +155,7 @@ To install a package:
- Set the required package version:
```shell
```shell
composer require <package_name>:<version>
```
......@@ -223,7 +223,7 @@ To install a package:
```
Result in the `composer.json` file:
```json
{
...
......@@ -240,7 +240,7 @@ To install a package:
},
...
}
```
```
You can unset this with the command:
......
......@@ -154,7 +154,7 @@ To add the GitLab NuGet Repository as a source for .NET, create a file named `nu
When uploading packages, note that:
- The Package Registry on GitLab.com can store up to 500 MB of content. This limit is [configurable for self-managed GitLab instances](../../../administration/instance_limits.md#package-registry-limits).
- The Package Registry on GitLab.com can store up to 500 MB of content. This limit is [configurable for self-managed GitLab instances](../../../administration/instance_limits.md#package-registry-limits).
- If you upload the same package with the same version multiple times, each consecutive upload
is saved as a separate file. When installing a package, GitLab serves the most recent file.
- When uploading packages to GitLab, they are not displayed in the packages UI of your project
......
......@@ -98,7 +98,7 @@ If you delete a label, it is permanently deleted. All references to the label ar
If you previously created a project label and now want to make it available for other
projects within the same group, you can promote it to a group label.
If other projects in the same group have a label with the same title, they are all
If other projects in the same group have a label with the same title, they are all
merged with the new group label. If a group label with the same title exists, it is
also merged.
......@@ -126,7 +126,7 @@ follow the same process as [creating a project label](#project-labels).
#### Create group labels from epics **(ULTIMATE)**
You can create group labels from the epic sidebar. The labels you create
You can create group labels from the epic sidebar. The labels you create
belong to the immediate group to which the epic belongs. The process is the same as
creating a [project label from an issue or merge request](#project-labels).
......@@ -160,7 +160,7 @@ title, for example:
![Scoped labels](img/labels_key_value_v13_5.png)
An issue, merge request or epic cannot have two scoped labels, of the form `key::value`,
with the same `key`. Adding a new label with the same `key`, but a different `value`
with the same `key`. Adding a new label with the same `key`, but a different `value`
causes the previous `key` label to be replaced with the new label.
For example:
......
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