Skip to content

Commit 47d41a2

Browse files
author
GitLab Bot
committed
Add latest changes from gitlab-org/gitlab@master
1 parent a25cab2 commit 47d41a2

File tree

35 files changed

+82
-79
lines changed

35 files changed

+82
-79
lines changed

.vale.ini

+3
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,6 @@ MinAlertLevel = suggestion
77

88
[*.md]
99
BasedOnStyles = gitlab
10+
11+
# Ignore SVG markup
12+
TokenIgnores = (\*\*\{\w*\}\*\*)

doc/administration/consul.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ Identify any existing health issues in the cluster by running the following comm
7777
within each node. The command will return an empty array if the cluster is healthy:
7878

7979
```shell
80-
curl http://127.0.0.1:8500/v1/health/state/critical
80+
curl "http://127.0.0.1:8500/v1/health/state/critical"
8181
```
8282

8383
Consul nodes communicate using the raft protocol. If the current leader goes

doc/administration/geo/setup/database.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ There is an [issue where support is being discussed](https://gitlab.com/gitlab-o
151151
##
152152
## Public address
153153
##
154-
echo "External address: $(curl --silent ipinfo.io/ip)"
154+
echo "External address: $(curl --silent "ipinfo.io/ip")"
155155
```
156156

157157
In most cases, the following addresses will be used to configure GitLab

doc/administration/invalidate_markdown_cache.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@ be done by [changing the application settings through
1919
the API](../api/settings.md#change-application-settings):
2020

2121
```shell
22-
curl --request PUT --header "PRIVATE-TOKEN: <your_access_token>" https://gitlab.example.com/api/v4/application/settings?local_markdown_version=<increased_number>
22+
curl --request PUT --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/application/settings?local_markdown_version=<increased_number>"
2323
```

doc/administration/operations/fast_ssh_key_lookup.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ the database. The following instructions can be used to build OpenSSH 7.5:
139139
```shell
140140
sudo su -
141141
cd /tmp
142-
curl --remote-name https://cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-7.5p1.tar.gz
142+
curl --remote-name "https://cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-7.5p1.tar.gz"
143143
tar xzvf openssh-7.5p1.tar.gz
144144
yum install rpm-build gcc make wget openssl-devel krb5-devel pam-devel libX11-devel xmkmf libXt-devel
145145
```

doc/administration/packages/container_registry.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1155,8 +1155,8 @@ After adding the setting, [reconfigure GitLab](../restart_gitlab.md#omnibus-gitl
11551155
Use curl to request debug output from the debug server:
11561156

11571157
```shell
1158-
curl localhost:5001/debug/health
1159-
curl localhost:5001/debug/vars
1158+
curl "localhost:5001/debug/health"
1159+
curl "localhost:5001/debug/vars"
11601160
```
11611161

11621162
### Advanced Troubleshooting
@@ -1236,7 +1236,7 @@ mitmproxy --port 9000
12361236
This command runs mitmproxy on port `9000`. In another window, run:
12371237

12381238
```shell
1239-
curl --proxy http://localhost:9000 https://httpbin.org/status/200
1239+
curl --proxy "http://localhost:9000" "https://httpbin.org/status/200"
12401240
```
12411241

12421242
If everything is set up correctly, information is displayed on the mitmproxy window and

doc/administration/reference_architectures/troubleshooting.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -434,13 +434,13 @@ If the monitoring node is not receiving any data, check that the exporters are
434434
capturing data.
435435

436436
```shell
437-
curl http[s]://localhost:<EXPORTER LISTENING PORT>/metric
437+
curl "http[s]://localhost:<EXPORTER LISTENING PORT>/metric"
438438
```
439439

440440
or
441441

442442
```shell
443-
curl http[s]://localhost:<EXPORTER LISTENING PORT>/-/metric
443+
curl "http[s]://localhost:<EXPORTER LISTENING PORT>/-/metric"
444444
```
445445

446446
## Troubleshooting PgBouncer

doc/administration/snippets/index.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,11 @@ The process to set the snippets size limit through the Application Settings API
6464
exactly the same as you would do to [update any other setting](../../api/settings.md#change-application-settings).
6565

6666
```shell
67-
curl --request PUT --header "PRIVATE-TOKEN: <your_access_token>" https://gitlab.example.com/api/v4/application/settings?snippet_size_limit=52428800
67+
curl --request PUT --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/application/settings?snippet_size_limit=52428800"
6868
```
6969

7070
You can also use the API to [retrieve the current value](../../api/settings.md#get-current-application-settings).
7171

7272
```shell
73-
curl --header "PRIVATE-TOKEN: <your_access_token>" https://gitlab.example.com/api/v4/application/settings
73+
curl --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/application/settings"
7474
```

doc/administration/troubleshooting/linux_cheat_sheet.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ nslookup example.com 1.1.1.1
303303
whois <ip_address> | grep -i "orgname\|netname"
304304

305305
# Curl headers with redirect
306-
curl --head --location https://example.com
306+
curl --head --location "https://example.com"
307307
```
308308

309309
## Package Management

doc/administration/troubleshooting/ssl.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ following issues:
2424
- `curl` fails:
2525

2626
```shell
27-
curl https://gitlab.domain.tld
27+
curl "https://gitlab.domain.tld"
2828
curl: (60) SSL certificate problem: unable to get local issuer certificate
2929
More details here: https://curl.haxx.se/docs/sslcerts.html
3030
```
@@ -125,7 +125,7 @@ The cause of the issue can be confirmed by checking if:
125125
- `curl` fails:
126126

127127
```shell
128-
$ curl https://gitlab.domain.tld
128+
$ curl "https://gitlab.domain.tld"
129129
curl: (60) SSL certificate problem: self signed certificate
130130
More details here: https://curl.haxx.se/docs/sslcerts.html
131131
```

doc/administration/troubleshooting/test_environments.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ docker run -d --name elasticsearch \
103103
docker.elastic.co/elasticsearch/elasticsearch:5.5.1
104104
```
105105

106-
Then confirm it works in the browser at `curl http://<IP_ADDRESS>:9200/_cat/health`.
106+
Then confirm it works in the browser at `curl "http://<IP_ADDRESS>:9200/_cat/health"`.
107107
Elasticsearch's default username is `elastic` and password is `changeme`.
108108

109109
### Kroki

doc/administration/troubleshooting/tracing_correlation_id.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ interested in.
5959
If you're using `curl` then you can use the verbose option to show request and response headers, as well as other debug info.
6060

6161
```shell
62-
~ curl --verbose https://gitlab.example.com/api/v4/projects
62+
~ curl --verbose "https://gitlab.example.com/api/v4/projects"
6363
# look for a line that looks like this
6464
< x-request-id: 4rAMkV3gof4
6565
```

doc/administration/wikis/index.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@ The process to set the wiki page size limit through the Application Settings API
6565
exactly the same as you would do to [update any other setting](../../api/settings.md#change-application-settings).
6666

6767
```shell
68-
curl --request PUT --header "PRIVATE-TOKEN: <your_access_token>" https://gitlab.example.com/api/v4/application/settings?wiki_page_max_content_bytes=52428800
68+
curl --request PUT --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/application/settings?wiki_page_max_content_bytes=52428800"
6969
```
7070

7171
You can also use the API to [retrieve the current value](../../api/settings.md#get-current-application-settings).
7272

7373
```shell
74-
curl --header "PRIVATE-TOKEN: <your_access_token>" https://gitlab.example.com/api/v4/application/settings
74+
curl --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/application/settings"
7575
```

doc/api/freeze_periods.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ Example request:
138138
```shell
139139
curl --header 'Content-Type: application/json' --header "PRIVATE-TOKEN: <your_access_token>" \
140140
--data '{ "freeze_end": "0 8 * * 1" }' \
141-
--request PUT https://gitlab.example.com/api/v4/projects/19/freeze_periods/1
141+
--request PUT "https://gitlab.example.com/api/v4/projects/19/freeze_periods/1"
142142
```
143143

144144
Example response:

doc/api/metrics_user_starred_dashboards.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Parameters:
2626
| `dashboard_path` | string | yes | URL-encoded path to file defining the dashboard which should be marked as favorite. |
2727

2828
```shell
29-
curl --header 'Private-Token: <your_access_token>' https://gitlab.example.com/api/v4/projects/20/metrics/user_starred_dashboards \
29+
curl --header 'Private-Token: <your_access_token>' "https://gitlab.example.com/api/v4/projects/20/metrics/user_starred_dashboards" \
3030
--data-urlencode "dashboard_path=config/prometheus/dashboards/common_metrics.yml"
3131
```
3232

@@ -57,7 +57,7 @@ Parameters:
5757
| `dashboard_path` | string | no | URL-encoded path to file defining the dashboard which should no longer be marked as favorite. When not supplied, all dashboards within given projects are removed from favorites. |
5858

5959
```shell
60-
curl --request DELETE --header 'Private-Token: <your_access_token>' https://gitlab.example.com/api/v4/projects/20/metrics/user_starred_dashboards \
60+
curl --request DELETE --header 'Private-Token: <your_access_token>' "https://gitlab.example.com/api/v4/projects/20/metrics/user_starred_dashboards" \
6161
--data-urlencode "dashboard_path=config/prometheus/dashboards/common_metrics.yml"
6262
```
6363

doc/ci/ci_cd_for_external_repos/bitbucket_integration.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ To use GitLab CI/CD with a Bitbucket Cloud repository:
110110
esac
111111

112112
echo "Pushing status to $BITBUCKET_STATUS_API..."
113-
curl --request POST $BITBUCKET_STATUS_API \
113+
curl --request POST "$BITBUCKET_STATUS_API" \
114114
--user $BITBUCKET_USERNAME:$BITBUCKET_ACCESS_TOKEN \
115115
--header "Content-Type:application/json" \
116116
--silent \

doc/ci/examples/laravel_with_gitlab_and_envoy/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ RUN apt-get clean
417417
RUN docker-php-ext-install mcrypt pdo_mysql zip
418418

419419
# Install Composer
420-
RUN curl --silent --show-error https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
420+
RUN curl --silent --show-error "https://getcomposer.org/installer" | php -- --install-dir=/usr/local/bin --filename=composer
421421

422422
# Install Laravel Envoy
423423
RUN composer global require "laravel/envoy=~1.0"

doc/ci/examples/php.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ apt-get update -yqq
5656
apt-get install git -yqq
5757
5858
# Install phpunit, the tool that we will use for testing
59-
curl --location --output /usr/local/bin/phpunit https://phar.phpunit.de/phpunit.phar
59+
curl --location --output /usr/local/bin/phpunit "https://phar.phpunit.de/phpunit.phar"
6060
chmod +x /usr/local/bin/phpunit
6161
6262
# Install mysql driver

doc/ci/triggers/README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ and it creates a dependent pipeline relation visible on the
5656
build_docs:
5757
stage: deploy
5858
script:
59-
- curl --request POST --form "token=$CI_JOB_TOKEN" --form ref=master https://gitlab.example.com/api/v4/projects/9/trigger/pipeline
59+
- curl --request POST --form "token=$CI_JOB_TOKEN" --form ref=master "https://gitlab.example.com/api/v4/projects/9/trigger/pipeline"
6060
only:
6161
- tags
6262
```
@@ -143,7 +143,7 @@ By using cURL you can trigger a pipeline rerun with minimal effort, for example:
143143
curl --request POST \
144144
--form token=TOKEN \
145145
--form ref=master \
146-
https://gitlab.example.com/api/v4/projects/9/trigger/pipeline
146+
"https://gitlab.example.com/api/v4/projects/9/trigger/pipeline"
147147
```
148148

149149
In this case, the project with ID `9` gets rebuilt on `master` branch.
@@ -244,7 +244,7 @@ curl --request POST \
244244
--form token=TOKEN \
245245
--form ref=master \
246246
--form "variables[UPLOAD_TO_S3]=true" \
247-
https://gitlab.example.com/api/v4/projects/9/trigger/pipeline
247+
"https://gitlab.example.com/api/v4/projects/9/trigger/pipeline"
248248
```
249249

250250
Trigger variables have the [highest priority](../variables/README.md#priority-of-environment-variables)
@@ -257,7 +257,7 @@ in conjunction with cron. The example below triggers a job on the `master`
257257
branch of project with ID `9` every night at `00:30`:
258258

259259
```shell
260-
30 0 * * * curl --request POST --form token=TOKEN --form ref=master https://gitlab.example.com/api/v4/projects/9/trigger/pipeline
260+
30 0 * * * curl --request POST --form token=TOKEN --form ref=master "https://gitlab.example.com/api/v4/projects/9/trigger/pipeline"
261261
```
262262

263263
This behavior can also be achieved through GitLab's UI with

doc/ci/yaml/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4257,7 +4257,7 @@ job_name:
42574257
- *some-script-before
42584258
script:
42594259
- *some-script
4260-
before_script:
4260+
after_script:
42614261
- *some-script-after
42624262
```
42634263

doc/development/chaos_endpoints.md

+10-10
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ GET /-/chaos/leakmem?memory_mb=1024&duration_s=50&async=true
6666
| `async` | boolean | no | Set to true to leak memory in a Sidekiq background worker process |
6767

6868
```shell
69-
curl http://localhost:3000/-/chaos/leakmem?memory_mb=1024&duration_s=10 --header 'X-Chaos-Secret: secret'
70-
curl http://localhost:3000/-/chaos/leakmem?memory_mb=1024&duration_s=10&token=secret
69+
curl "http://localhost:3000/-/chaos/leakmem?memory_mb=1024&duration_s=10" --header 'X-Chaos-Secret: secret'
70+
curl "http://localhost:3000/-/chaos/leakmem?memory_mb=1024&duration_s=10&token=secret"
7171
```
7272

7373
## CPU spin
@@ -89,8 +89,8 @@ GET /-/chaos/cpu_spin?duration_s=50&async=true
8989
| `async` | boolean | no | Set to true to consume CPU in a Sidekiq background worker process |
9090

9191
```shell
92-
curl http://localhost:3000/-/chaos/cpu_spin?duration_s=60 --header 'X-Chaos-Secret: secret'
93-
curl http://localhost:3000/-/chaos/cpu_spin?duration_s=60&token=secret
92+
curl "http://localhost:3000/-/chaos/cpu_spin?duration_s=60" --header 'X-Chaos-Secret: secret'
93+
curl "http://localhost:3000/-/chaos/cpu_spin?duration_s=60&token=secret"
9494
```
9595

9696
## DB spin
@@ -114,8 +114,8 @@ GET /-/chaos/db_spin?duration_s=50&async=true
114114
| `async` | boolean | no | Set to true to perform the operation in a Sidekiq background worker process |
115115

116116
```shell
117-
curl http://localhost:3000/-/chaos/db_spin?interval_s=1&duration_s=60 --header 'X-Chaos-Secret: secret'
118-
curl http://localhost:3000/-/chaos/db_spin?interval_s=1&duration_s=60&token=secret
117+
curl "http://localhost:3000/-/chaos/db_spin?interval_s=1&duration_s=60" --header 'X-Chaos-Secret: secret'
118+
curl "http://localhost:3000/-/chaos/db_spin?interval_s=1&duration_s=60&token=secret"
119119
```
120120

121121
## Sleep
@@ -136,8 +136,8 @@ GET /-/chaos/sleep?duration_s=50&async=true
136136
| `async` | boolean | no | Set to true to sleep in a Sidekiq background worker process |
137137

138138
```shell
139-
curl http://localhost:3000/-/chaos/sleep?duration_s=60 --header 'X-Chaos-Secret: secret'
140-
curl http://localhost:3000/-/chaos/sleep?duration_s=60&token=secret
139+
curl "http://localhost:3000/-/chaos/sleep?duration_s=60" --header 'X-Chaos-Secret: secret'
140+
curl "http://localhost:3000/-/chaos/sleep?duration_s=60&token=secret"
141141
```
142142

143143
## Kill
@@ -157,6 +157,6 @@ GET /-/chaos/kill?async=true
157157
| `async` | boolean | no | Set to true to kill a Sidekiq background worker process |
158158

159159
```shell
160-
curl http://localhost:3000/-/chaos/kill --header 'X-Chaos-Secret: secret'
161-
curl http://localhost:3000/-/chaos/kill?token=secret
160+
curl "http://localhost:3000/-/chaos/kill" --header 'X-Chaos-Secret: secret'
161+
curl "http://localhost:3000/-/chaos/kill?token=secret"
162162
```

doc/development/gitaly.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ the integration by using GDK:
345345
1. Check that the list of current metrics has the new counter for the feature flag:
346346

347347
```shell
348-
curl --silent http://localhost:9236/metrics | grep go_find_all_tags
348+
curl --silent "http://localhost:9236/metrics" | grep go_find_all_tags
349349
```
350350

351351
1. Once you observe the metrics for the new feature flag and it increments, you
@@ -375,5 +375,5 @@ the integration by using GDK:
375375
1. Verify the feature is on by observing the metrics for it:
376376
377377
```shell
378-
curl --silent http://localhost:9236/metrics | grep go_find_all_tags
378+
curl --silent "http://localhost:9236/metrics" | grep go_find_all_tags
379379
```

doc/development/internal_api.md

+7-7
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ POST /internal/allowed
6060
Example request:
6161

6262
```shell
63-
curl --request POST --header "Gitlab-Shared-Secret: <Base64 encoded token>" --data "key_id=11&project=gnuwget/wget2&action=git-upload-pack&protocol=ssh" http://localhost:3001/api/v4/internal/allowed
63+
curl --request POST --header "Gitlab-Shared-Secret: <Base64 encoded token>" --data "key_id=11&project=gnuwget/wget2&action=git-upload-pack&protocol=ssh" "http://localhost:3001/api/v4/internal/allowed"
6464
```
6565

6666
Example response:
@@ -108,7 +108,7 @@ information for LFS clients when the repository is accessed over SSH.
108108
Example request:
109109

110110
```shell
111-
curl --request POST --header "Gitlab-Shared-Secret: <Base64 encoded token>" --data "key_id=11&project=gnuwget/wget2" http://localhost:3001/api/v4/internal/lfs_authenticate
111+
curl --request POST --header "Gitlab-Shared-Secret: <Base64 encoded token>" --data "key_id=11&project=gnuwget/wget2" "http://localhost:3001/api/v4/internal/lfs_authenticate"
112112
```
113113

114114
```json
@@ -141,7 +141,7 @@ GET /internal/authorized_keys
141141
Example request:
142142

143143
```shell
144-
curl --request GET --header "Gitlab-Shared-Secret: <Base64 encoded secret>""http://localhost:3001/api/v4/internal/authorized_keys?key=<key as passed by OpenSSH>"
144+
curl --request GET --header "Gitlab-Shared-Secret: <Base64 encoded secret>" "http://localhost:3001/api/v4/internal/authorized_keys?key=<key as passed by OpenSSH>"
145145
```
146146

147147
Example response:
@@ -242,7 +242,7 @@ GET /internal/two_factor_recovery_codes
242242
Example request:
243243

244244
```shell
245-
curl --request POST --header "Gitlab-Shared-Secret: <Base64 encoded secret>" --data "key_id=7" http://localhost:3001/api/v4/internal/two_factor_recovery_codes
245+
curl --request POST --header "Gitlab-Shared-Secret: <Base64 encoded secret>" --data "key_id=7" "http://localhost:3001/api/v4/internal/two_factor_recovery_codes"
246246
```
247247

248248
Example response:
@@ -289,7 +289,7 @@ POST /internal/personal_access_token
289289
Example request:
290290

291291
```shell
292-
curl --request POST --header "Gitlab-Shared-Secret: <Base64 encoded secret>" --data "user_id=29&name=mytokenname&scopes[]=read_user&scopes[]=read_repository&expires_at=2020-07-24" http://localhost:3001/api/v4/internal/personal_access_token
292+
curl --request POST --header "Gitlab-Shared-Secret: <Base64 encoded secret>" --data "user_id=29&name=mytokenname&scopes[]=read_user&scopes[]=read_repository&expires_at=2020-07-24" "http://localhost:3001/api/v4/internal/personal_access_token"
293293
```
294294

295295
Example response:
@@ -323,7 +323,7 @@ POST /internal/pre_receive
323323
Example request:
324324

325325
```shell
326-
curl --request POST --header "Gitlab-Shared-Secret: <Base64 encoded secret>" --data "gl_repository=project-7" http://localhost:3001/api/v4/internal/pre_receive
326+
curl --request POST --header "Gitlab-Shared-Secret: <Base64 encoded secret>" --data "gl_repository=project-7" "http://localhost:3001/api/v4/internal/pre_receive"
327327
```
328328

329329
Example response:
@@ -355,7 +355,7 @@ POST /internal/post_receive
355355
Example Request:
356356

357357
```shell
358-
curl --request POST --header "Gitlab-Shared-Secret: <Base64 encoded secret>" --data "gl_repository=project-7" --data "identifier=user-1" --data "changes=0000000000000000000000000000000000000000 fd9e76b9136bdd9fe217061b497745792fe5a5ee gh-pages\n" http://localhost:3001/api/v4/internal/post_receive
358+
curl --request POST --header "Gitlab-Shared-Secret: <Base64 encoded secret>" --data "gl_repository=project-7" --data "identifier=user-1" --data "changes=0000000000000000000000000000000000000000 fd9e76b9136bdd9fe217061b497745792fe5a5ee gh-pages\n" "http://localhost:3001/api/v4/internal/post_receive"
359359
```
360360

361361
Example response:

doc/development/python_guide/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ brew install pyenv
3030
To install `pyenv` on Linux, you can run the command below:
3131

3232
```shell
33-
curl https://pyenv.run | bash
33+
curl "https://pyenv.run" | bash
3434
```
3535

3636
Alternatively, you may find `pyenv` available as a system package via your distro package manager.

0 commit comments

Comments
 (0)