summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-16 03:09:14 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-16 03:09:14 +0000
commit78fe72d153260c355fdfd533b125026cce310da7 (patch)
tree0d90106443bea87cc24e2834273ae6c8dcac0260 /doc
parent88797b994a7dfd9bfab2a5d5431f088f17078b9f (diff)
downloadgitlab-ce-78fe72d153260c355fdfd533b125026cce310da7.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
-rw-r--r--doc/administration/gitaly/img/praefect_architecture_v12_9.pngbin158447 -> 44098 bytes
-rw-r--r--doc/administration/operations/unicorn.md2
-rw-r--r--doc/administration/packages/index.md4
-rw-r--r--doc/administration/troubleshooting/gdb-stuck-ruby.txt6
-rw-r--r--doc/administration/troubleshooting/img/AzureAD-basic_SAML.pngbin96021 -> 30365 bytes
-rw-r--r--doc/administration/troubleshooting/img/AzureAD-claims.pngbin55574 -> 14213 bytes
-rw-r--r--doc/administration/troubleshooting/img/OneLogin-SSOsettings.pngbin85242 -> 25397 bytes
-rw-r--r--doc/administration/troubleshooting/img/OneLogin-app_details.pngbin61390 -> 18305 bytes
-rw-r--r--doc/administration/troubleshooting/img/OneLogin-encryption.pngbin34245 -> 9980 bytes
-rw-r--r--doc/administration/troubleshooting/img/OneLogin-parameters.pngbin17139 -> 5051 bytes
-rw-r--r--doc/administration/troubleshooting/img/OneLogin-userAdd.pngbin32711 -> 10021 bytes
-rw-r--r--doc/administration/troubleshooting/kubernetes_cheat_sheet.md6
-rw-r--r--doc/ci/environments/img/incremental_rollouts_play_v12_7.pngbin94182 -> 26784 bytes
-rw-r--r--doc/ci/environments/img/timed_rollout_v12_7.pngbin73699 -> 24016 bytes
-rw-r--r--doc/ci/examples/test_phoenix_app_with_gitlab_ci_cd/img/select_template_v12_6.pngbin51825 -> 32253 bytes
-rw-r--r--doc/ci/examples/test_phoenix_app_with_gitlab_ci_cd/img/set_up_ci_v12_6.pngbin93168 -> 57203 bytes
-rw-r--r--doc/ci/img/environment_auto_stop_v12_8.pngbin43534 -> 16587 bytes
-rw-r--r--doc/ci/img/environments_deployment_cluster_v12_8.pngbin58639 -> 17704 bytes
-rw-r--r--doc/ci/img/parent_pipeline_graph_expanded_v12_6.pngbin298902 -> 96087 bytes
-rw-r--r--doc/ci/pipelines/img/collapsible_log_v12_6.pngbin294959 -> 96471 bytes
-rw-r--r--doc/ci/pipelines/img/pipelines_duration_chart.pngbin36476 -> 10587 bytes
-rw-r--r--doc/ci/pipelines/img/pipelines_success_chart.pngbin76647 -> 23249 bytes
-rw-r--r--doc/ci/review_apps/img/enable_review_app_v12_8.pngbin46424 -> 17151 bytes
-rw-r--r--doc/development/event_tracking/frontend.md4
-rw-r--r--doc/development/img/reference_architecture.pngbin112468 -> 44285 bytes
-rw-r--r--doc/development/import_export.md22
-rw-r--r--doc/development/integrations/secure.md2
-rw-r--r--doc/development/reference_processing.md2
-rw-r--r--doc/development/testing_guide/end_to_end/rspec_metadata_tests.md10
-rw-r--r--doc/install/aws/img/aws_ha_architecture_diagram.pngbin141351 -> 40323 bytes
-rw-r--r--doc/install/aws/index.md2
-rw-r--r--doc/integration/elasticsearch.md2
-rw-r--r--doc/integration/img/jira_dev_panel_jira_setup_1-1.pngbin45848 -> 13286 bytes
-rw-r--r--doc/integration/img/jira_dev_panel_setup_com_1.pngbin50565 -> 15392 bytes
-rw-r--r--doc/integration/img/jira_dev_panel_setup_com_2.pngbin66881 -> 22370 bytes
-rw-r--r--doc/integration/img/jira_dev_panel_setup_com_3.pngbin24910 -> 7639 bytes
-rw-r--r--doc/legal/corporate_contributor_license_agreement.md2
-rw-r--r--doc/security/webhooks.md10
-rw-r--r--doc/subscriptions/index.md2
-rw-r--r--doc/topics/git/numerous_undo_possibilities_in_git/index.md6
-rw-r--r--doc/user/admin_area/settings/img/admin_package_registry_npm_package_requests_forward.pngbin77490 -> 28630 bytes
-rw-r--r--doc/user/admin_area/settings/img/gitaly_timeouts.pngbin68410 -> 24654 bytes
-rw-r--r--doc/user/analytics/img/code_review_analytics_v12_8.pngbin110305 -> 40082 bytes
-rw-r--r--doc/user/discussions/img/suggestion_code_block_output_v12_8.pngbin29769 -> 15870 bytes
-rw-r--r--doc/user/group/epics/img/epic_view_roadmap_v12_9.pngbin434985 -> 127201 bytes
-rw-r--r--doc/user/group/issues_analytics/img/issues_created_per_month_v12_8.pngbin66854 -> 26718 bytes
-rw-r--r--doc/user/group/roadmap/img/roadmap_view_v12_9.pngbin414880 -> 118218 bytes
-rw-r--r--doc/user/img/markdown_copy_from_spreadsheet_v12_7.pngbin371532 -> 180083 bytes
-rw-r--r--doc/user/img/markdown_paste_table_v12_7.pngbin153855 -> 89728 bytes
-rw-r--r--doc/user/packages/container_registry/img/expiration-policy-app.pngbin93286 -> 32054 bytes
-rw-r--r--doc/user/packages/nuget_repository/img/visual_studio_adding_nuget_source.pngbin115238 -> 36730 bytes
-rw-r--r--doc/user/packages/nuget_repository/img/visual_studio_nuget_source_added.pngbin75079 -> 23888 bytes
-rw-r--r--doc/user/project/clusters/img/kubernetes_pod_logs_v12_9.pngbin245204 -> 117938 bytes
-rw-r--r--doc/user/project/clusters/serverless/img/function-list_v12_7.pngbin41173 -> 18551 bytes
-rw-r--r--doc/user/project/clusters/serverless/img/sam-api-endpoint.pngbin59484 -> 29991 bytes
-rw-r--r--doc/user/project/clusters/serverless/img/sam-complete-raw.pngbin100590 -> 38847 bytes
-rw-r--r--doc/user/project/img/deploy_boards_landing_page.pngbin43047 -> 14454 bytes
-rw-r--r--doc/user/project/img/issue_boards_blocked_icon_v12_8.pngbin66310 -> 31841 bytes
-rw-r--r--doc/user/project/img/issue_boards_multi_select_v12_4.png (renamed from doc/user/project/img/issue_boards_multi_select.png)bin6205 -> 6205 bytes
-rw-r--r--doc/user/project/img/labels_key_value_v12_1.pngbin166480 -> 55495 bytes
-rw-r--r--doc/user/project/integrations/img/grafana_embedded.pngbin64082 -> 28071 bytes
-rw-r--r--doc/user/project/issue_board.md25
-rw-r--r--doc/user/project/issues/img/related_issue_block_v12_8.pngbin117786 -> 35817 bytes
-rw-r--r--doc/user/project/issues/img/related_issues_add_v12_8.pngbin105785 -> 32939 bytes
-rw-r--r--doc/user/project/issues/img/related_issues_remove_v12_8.pngbin36051 -> 10708 bytes
-rw-r--r--doc/user/project/merge_requests/img/approvals_premium_mr_widget_v12_7.pngbin198351 -> 50214 bytes
-rw-r--r--doc/user/project/merge_requests/img/mr_approvals_by_code_owners_v12_7.pngbin88749 -> 25594 bytes
-rw-r--r--doc/user/project/merge_requests/img/scoped_to_protected_branch_v12_8.pngbin91714 -> 32970 bytes
-rw-r--r--doc/user/project/releases/img/releases_count_v12_8.pngbin92444 -> 27622 bytes
-rw-r--r--doc/user/project/releases/img/upcoming_release_v12_7.pngbin87736 -> 23246 bytes
-rw-r--r--doc/user/project/repository/img/forking_workflow_fork_button.pngbin27407 -> 10365 bytes
-rw-r--r--doc/user/project/repository/reducing_the_repo_size_using_git.md2
72 files changed, 60 insertions, 49 deletions
diff --git a/doc/administration/gitaly/img/praefect_architecture_v12_9.png b/doc/administration/gitaly/img/praefect_architecture_v12_9.png
index 3937789094c..b68e495cb17 100644
--- a/doc/administration/gitaly/img/praefect_architecture_v12_9.png
+++ b/doc/administration/gitaly/img/praefect_architecture_v12_9.png
Binary files differ
diff --git a/doc/administration/operations/unicorn.md b/doc/administration/operations/unicorn.md
index 561cd7ac1ce..bab20a76546 100644
--- a/doc/administration/operations/unicorn.md
+++ b/doc/administration/operations/unicorn.md
@@ -65,7 +65,7 @@ maximum memory threshold (in bytes) for the Unicorn worker killer by
setting the following values `/etc/gitlab/gitlab.rb`:
- For GitLab **12.7** and newer:
-
+
```ruby
unicorn['worker_memory_limit_min'] = "1024 * 1 << 20"
unicorn['worker_memory_limit_max'] = "1280 * 1 << 20"
diff --git a/doc/administration/packages/index.md b/doc/administration/packages/index.md
index a12aec3c7b3..40867fc15b6 100644
--- a/doc/administration/packages/index.md
+++ b/doc/administration/packages/index.md
@@ -118,10 +118,10 @@ upload packages:
#'path_style' => false # If true, use 'host/bucket_name/object' instead of 'bucket_name.host/object'.
}
```
-
+
NOTE: **Note:**
Some build tools, like Gradle, must make `HEAD` requests to Amazon S3 to pull a dependency’s metadata. The `gitlab_rails['packages_object_store_proxy_download']` property must be set to `true`. Without this setting, GitLab won't act as a proxy to the Amazon S3 service, and will instead return the signed URL. This will cause a `HTTP 403 Forbidden` response, since Amazon S3 expects a signed URL.
-
+
1. Save the file and [reconfigure GitLab](../restart_gitlab.md#omnibus-gitlab-reconfigure)
for the changes to take effect.
diff --git a/doc/administration/troubleshooting/gdb-stuck-ruby.txt b/doc/administration/troubleshooting/gdb-stuck-ruby.txt
index 13d5dfcffa4..de8d704f9e3 100644
--- a/doc/administration/troubleshooting/gdb-stuck-ruby.txt
+++ b/doc/administration/troubleshooting/gdb-stuck-ruby.txt
@@ -1,6 +1,6 @@
# Here's the script I'll use to demonstrate - it just loops forever:
-$ cat test.rb
+$ cat test.rb
#!/usr/bin/env ruby
loop do
@@ -75,7 +75,7 @@ Thread 1 (Thread 0xb74d76c0 (LWP 1343)):
at eval.c:5778
#5 rb_call0 (klass=3075304600, recv=3075299660, id=9393, oid=9393, argc=1, argv=0xbf85f490, body=0xb74c85a8, flags=2)
at eval.c:5928
-#6 0x0805e35d in rb_call (klass=3075304600, recv=3075299660, mid=9393, argc=1, argv=0xbf85f490, scope=1,
+#6 0x0805e35d in rb_call (klass=3075304600, recv=3075299660, mid=9393, argc=1, argv=0xbf85f490, scope=1,
self=<optimized out>) at eval.c:6176
#7 0x080651ec in rb_eval (self=3075299660, n=0xb74c4e1c) at eval.c:3521
#8 0x0805c31c in rb_yield_0 (val=6, self=3075299660, klass=<optimized out>, flags=0, avalue=0) at eval.c:5095
@@ -139,4 +139,4 @@ A debugging session is active.
Quit anyway? (y or n) y
Detaching from program: /opt/vagrant_ruby/bin/ruby, process 1343
-$
+$
diff --git a/doc/administration/troubleshooting/img/AzureAD-basic_SAML.png b/doc/administration/troubleshooting/img/AzureAD-basic_SAML.png
index a553dc182ce..e86ad7572e8 100644
--- a/doc/administration/troubleshooting/img/AzureAD-basic_SAML.png
+++ b/doc/administration/troubleshooting/img/AzureAD-basic_SAML.png
Binary files differ
diff --git a/doc/administration/troubleshooting/img/AzureAD-claims.png b/doc/administration/troubleshooting/img/AzureAD-claims.png
index ef594390ce0..aab92288704 100644
--- a/doc/administration/troubleshooting/img/AzureAD-claims.png
+++ b/doc/administration/troubleshooting/img/AzureAD-claims.png
Binary files differ
diff --git a/doc/administration/troubleshooting/img/OneLogin-SSOsettings.png b/doc/administration/troubleshooting/img/OneLogin-SSOsettings.png
index 72737b9a017..58f936d8567 100644
--- a/doc/administration/troubleshooting/img/OneLogin-SSOsettings.png
+++ b/doc/administration/troubleshooting/img/OneLogin-SSOsettings.png
Binary files differ
diff --git a/doc/administration/troubleshooting/img/OneLogin-app_details.png b/doc/administration/troubleshooting/img/OneLogin-app_details.png
index 3e36a001d1b..77618960897 100644
--- a/doc/administration/troubleshooting/img/OneLogin-app_details.png
+++ b/doc/administration/troubleshooting/img/OneLogin-app_details.png
Binary files differ
diff --git a/doc/administration/troubleshooting/img/OneLogin-encryption.png b/doc/administration/troubleshooting/img/OneLogin-encryption.png
index a1b90873a5a..2b811409bd0 100644
--- a/doc/administration/troubleshooting/img/OneLogin-encryption.png
+++ b/doc/administration/troubleshooting/img/OneLogin-encryption.png
Binary files differ
diff --git a/doc/administration/troubleshooting/img/OneLogin-parameters.png b/doc/administration/troubleshooting/img/OneLogin-parameters.png
index c9ff4f8f018..a2fa734152c 100644
--- a/doc/administration/troubleshooting/img/OneLogin-parameters.png
+++ b/doc/administration/troubleshooting/img/OneLogin-parameters.png
Binary files differ
diff --git a/doc/administration/troubleshooting/img/OneLogin-userAdd.png b/doc/administration/troubleshooting/img/OneLogin-userAdd.png
index c7187fe5dd6..54c1ecd2e68 100644
--- a/doc/administration/troubleshooting/img/OneLogin-userAdd.png
+++ b/doc/administration/troubleshooting/img/OneLogin-userAdd.png
Binary files differ
diff --git a/doc/administration/troubleshooting/kubernetes_cheat_sheet.md b/doc/administration/troubleshooting/kubernetes_cheat_sheet.md
index 38c0661da06..ec59705ca99 100644
--- a/doc/administration/troubleshooting/kubernetes_cheat_sheet.md
+++ b/doc/administration/troubleshooting/kubernetes_cheat_sheet.md
@@ -77,11 +77,11 @@ and they will assist you with any issues you are having.
```shell
kubectl get cronjobs
```
-
+
When one configures [cron-based backups](https://docs.gitlab.com/charts/backup-restore/backup.html#cron-based-backup),
you will be able to see the new schedule here. Some details about the schedules can be found
in [Running Automated Tasks with a CronJob](https://kubernetes.io/docs/tasks/job/automated-tasks-with-cron-jobs/#creating-a-cron-job)
-
+
## GitLab-specific Kubernetes information
- Minimal config that can be used to test a Kubernetes Helm chart can be found
@@ -167,7 +167,7 @@ and they will assist you with any issues you are having.
```shell
kubectl exec -it <task-runner-pod-name> -- /srv/gitlab/bin/rails dbconsole -p
```
-
+
- How to get info about Helm installation status:
```shell
diff --git a/doc/ci/environments/img/incremental_rollouts_play_v12_7.png b/doc/ci/environments/img/incremental_rollouts_play_v12_7.png
index 314c4a07af0..9d3ca258b08 100644
--- a/doc/ci/environments/img/incremental_rollouts_play_v12_7.png
+++ b/doc/ci/environments/img/incremental_rollouts_play_v12_7.png
Binary files differ
diff --git a/doc/ci/environments/img/timed_rollout_v12_7.png b/doc/ci/environments/img/timed_rollout_v12_7.png
index 6b83bfc574e..94f5d50020f 100644
--- a/doc/ci/environments/img/timed_rollout_v12_7.png
+++ b/doc/ci/environments/img/timed_rollout_v12_7.png
Binary files differ
diff --git a/doc/ci/examples/test_phoenix_app_with_gitlab_ci_cd/img/select_template_v12_6.png b/doc/ci/examples/test_phoenix_app_with_gitlab_ci_cd/img/select_template_v12_6.png
index 97887db4486..c8c5e152a13 100644
--- a/doc/ci/examples/test_phoenix_app_with_gitlab_ci_cd/img/select_template_v12_6.png
+++ b/doc/ci/examples/test_phoenix_app_with_gitlab_ci_cd/img/select_template_v12_6.png
Binary files differ
diff --git a/doc/ci/examples/test_phoenix_app_with_gitlab_ci_cd/img/set_up_ci_v12_6.png b/doc/ci/examples/test_phoenix_app_with_gitlab_ci_cd/img/set_up_ci_v12_6.png
index 85fb58d4458..fafabb27bac 100644
--- a/doc/ci/examples/test_phoenix_app_with_gitlab_ci_cd/img/set_up_ci_v12_6.png
+++ b/doc/ci/examples/test_phoenix_app_with_gitlab_ci_cd/img/set_up_ci_v12_6.png
Binary files differ
diff --git a/doc/ci/img/environment_auto_stop_v12_8.png b/doc/ci/img/environment_auto_stop_v12_8.png
index 3a3c54ab62d..f098938ef04 100644
--- a/doc/ci/img/environment_auto_stop_v12_8.png
+++ b/doc/ci/img/environment_auto_stop_v12_8.png
Binary files differ
diff --git a/doc/ci/img/environments_deployment_cluster_v12_8.png b/doc/ci/img/environments_deployment_cluster_v12_8.png
index dfda1deb649..7fa6d3515a8 100644
--- a/doc/ci/img/environments_deployment_cluster_v12_8.png
+++ b/doc/ci/img/environments_deployment_cluster_v12_8.png
Binary files differ
diff --git a/doc/ci/img/parent_pipeline_graph_expanded_v12_6.png b/doc/ci/img/parent_pipeline_graph_expanded_v12_6.png
index 5c493109a54..db18cc201fc 100644
--- a/doc/ci/img/parent_pipeline_graph_expanded_v12_6.png
+++ b/doc/ci/img/parent_pipeline_graph_expanded_v12_6.png
Binary files differ
diff --git a/doc/ci/pipelines/img/collapsible_log_v12_6.png b/doc/ci/pipelines/img/collapsible_log_v12_6.png
index 24b2c83f7c1..a1e9aeb244a 100644
--- a/doc/ci/pipelines/img/collapsible_log_v12_6.png
+++ b/doc/ci/pipelines/img/collapsible_log_v12_6.png
Binary files differ
diff --git a/doc/ci/pipelines/img/pipelines_duration_chart.png b/doc/ci/pipelines/img/pipelines_duration_chart.png
index 0be7539ba0a..12ec262dadb 100644
--- a/doc/ci/pipelines/img/pipelines_duration_chart.png
+++ b/doc/ci/pipelines/img/pipelines_duration_chart.png
Binary files differ
diff --git a/doc/ci/pipelines/img/pipelines_success_chart.png b/doc/ci/pipelines/img/pipelines_success_chart.png
index 10602b75eeb..f44dc25ff1c 100644
--- a/doc/ci/pipelines/img/pipelines_success_chart.png
+++ b/doc/ci/pipelines/img/pipelines_success_chart.png
Binary files differ
diff --git a/doc/ci/review_apps/img/enable_review_app_v12_8.png b/doc/ci/review_apps/img/enable_review_app_v12_8.png
index 364fe402787..7d40f49725f 100644
--- a/doc/ci/review_apps/img/enable_review_app_v12_8.png
+++ b/doc/ci/review_apps/img/enable_review_app_v12_8.png
Binary files differ
diff --git a/doc/development/event_tracking/frontend.md b/doc/development/event_tracking/frontend.md
index 42c82a745db..fcd394500ec 100644
--- a/doc/development/event_tracking/frontend.md
+++ b/doc/development/event_tracking/frontend.md
@@ -149,12 +149,12 @@ import { mockTracking, triggerEvent } from 'spec/helpers/tracking_helper';
describe('my component', () => {
let trackingSpy;
-
+
beforeEach(() => {
const vm = mountComponent(MyComponent);
trackingSpy = mockTracking('_category_', vm.$el, spyOn);
});
-
+
it('tracks an event when toggled', () => {
triggerEvent('a.toggle');
diff --git a/doc/development/img/reference_architecture.png b/doc/development/img/reference_architecture.png
index 1414200d076..107135b626e 100644
--- a/doc/development/img/reference_architecture.png
+++ b/doc/development/img/reference_architecture.png
Binary files differ
diff --git a/doc/development/import_export.md b/doc/development/import_export.md
index 252a57ce857..68f7b78337d 100644
--- a/doc/development/import_export.md
+++ b/doc/development/import_export.md
@@ -195,17 +195,17 @@ module Gitlab
The [current version history](../user/project/settings/import_export.md) also displays the equivalent GitLab version
and it is useful for knowing which versions won't be compatible between them.
-| Exporting GitLab version | Importing GitLab version |
-| -------------------------- | -------------------------- |
-| 11.7 to current | 11.7 to current |
-| 11.1 to 11.6 | 11.1 to 11.6 |
-| 10.8 to 11.0 | 10.8 to 11.0 |
-| 10.4 to 10.7 | 10.4 to 10.7 |
-| ... | ... |
-| 8.10.3 to 8.11 | 8.10.3 to 8.11 |
-| 8.10.0 to 8.10.2 | 8.10.0 to 8.10.2 |
-| 8.9.5 to 8.9.11 | 8.9.5 to 8.9.11 |
-| 8.9.0 to 8.9.4 | 8.9.0 to 8.9.4 |
+| Exporting GitLab version | Importing GitLab version |
+| -------------------------- | -------------------------- |
+| 11.7 to current | 11.7 to current |
+| 11.1 to 11.6 | 11.1 to 11.6 |
+| 10.8 to 11.0 | 10.8 to 11.0 |
+| 10.4 to 10.7 | 10.4 to 10.7 |
+| ... | ... |
+| 8.10.3 to 8.11 | 8.10.3 to 8.11 |
+| 8.10.0 to 8.10.2 | 8.10.0 to 8.10.2 |
+| 8.9.5 to 8.9.11 | 8.9.5 to 8.9.11 |
+| 8.9.0 to 8.9.4 | 8.9.0 to 8.9.4 |
### When to bump the version up
diff --git a/doc/development/integrations/secure.md b/doc/development/integrations/secure.md
index 74e16751b31..5792ce303e1 100644
--- a/doc/development/integrations/secure.md
+++ b/doc/development/integrations/secure.md
@@ -278,7 +278,7 @@ and where the `message` repeats the `location` field:
It takes around 50k characters to block for 2 seconds making this a low severity issue."
}
```
-
+
The `description` might explain how the vulnerability works or give context about the exploit.
It should not repeat the other fields of the vulnerability object.
In particular, the `description` should not repeat the `location` (what is affected)
diff --git a/doc/development/reference_processing.md b/doc/development/reference_processing.md
index c6c629f3314..ef1f2f5269c 100644
--- a/doc/development/reference_processing.md
+++ b/doc/development/reference_processing.md
@@ -43,7 +43,7 @@ Subclasses of `AbstractReferenceFilter` generally do not override `#call`; inste
a minimum implementation of `AbstractReferenceFilter` should define:
- `.reference_type`: The type of domain object.
-
+
This is usually a keyword, and is used to set the `data-reference-type` attribute
on the generated link, and is an important part of the interaction with the
corresponding `ReferenceParser` (see below).
diff --git a/doc/development/testing_guide/end_to_end/rspec_metadata_tests.md b/doc/development/testing_guide/end_to_end/rspec_metadata_tests.md
index abc7c88b4f2..4f0e506a964 100644
--- a/doc/development/testing_guide/end_to_end/rspec_metadata_tests.md
+++ b/doc/development/testing_guide/end_to_end/rspec_metadata_tests.md
@@ -6,8 +6,10 @@ This is a partial list of the [RSpec metadata](https://relishapp.com/rspec/rspec
<!-- Please keep the tags in alphabetical order -->
| Tag | Description |
-|-|-|
-| `:elasticsearch` | The test requires an Elasticsearch service. It is used by the [instance-level scenario](https://gitlab.com/gitlab-org/gitlab-qa#definitions) [`Test::Integration::Elasticsearch`](https://gitlab.com/gitlab-org/gitlab/-/blob/72b62b51bdf513e2936301cb6c7c91ec27c35b4d/qa/qa/ee/scenario/test/integration/elasticsearch.rb) to include only tests that require Elasticsearch. |
-| `:orchestrated` | The GitLab instance under test may be [configured by `gitlab-qa`](https://gitlab.com/gitlab-org/gitlab-qa/-/blob/master/docs/what_tests_can_be_run.md#orchestrated-tests) to be different to the default GitLab configuration, or `gitlab-qa` may launch additional services in separate docker containers, or both. Tests tagged with `:orchestrated` are excluded when testing environments where we can't dynamically modify GitLab's configuration (for example, Staging). |
-| `:quarantine` | The test has been [quarantined](https://about.gitlab.com/handbook/engineering/quality/guidelines/debugging-qa-test-failures/#quarantining-tests), will run in a separate job that only includes quarantined tests, and is allowed to fail. The test will be skipped in its regular job so that if it fails it will not hold up the pipeline. |
+|-----|-------------|
+| `:elasticsearch` | The test requires an Elasticsearch service. It is used by the [instance-level scenario](https://gitlab.com/gitlab-org/gitlab-qa#definitions) [`Test::Integration::Elasticsearch`](https://gitlab.com/gitlab-org/gitlab/-/blob/72b62b51bdf513e2936301cb6c7c91ec27c35b4d/qa/qa/ee/scenario/test/integration/elasticsearch.rb) to include only tests that require Elasticsearch. |
+| `:kubernetes` | The test includes a GitLab instance that is configured to be run behind an SSH tunnel, allowing a TLS-accessible GitLab. This test will also include provisioning of at least one Kubernetes cluster to test against. *This tag is often be paired with `:orchestrated`.* |
+| `:orchestrated` | The GitLab instance under test may be [configured by `gitlab-qa`](https://gitlab.com/gitlab-org/gitlab-qa/-/blob/master/docs/what_tests_can_be_run.md#orchestrated-tests) to be different to the default GitLab configuration, or `gitlab-qa` may launch additional services in separate docker containers, or both. Tests tagged with `:orchestrated` are excluded when testing environments where we can't dynamically modify GitLab's configuration (for example, Staging). |
+| `:quarantine` | The test has been [quarantined](https://about.gitlab.com/handbook/engineering/quality/guidelines/debugging-qa-test-failures/#quarantining-tests), will run in a separate job that only includes quarantined tests, and is allowed to fail. The test will be skipped in its regular job so that if it fails it will not hold up the pipeline. |
+| `:reliable` | The test has been [promoted to a reliable test](https://about.gitlab.com/handbook/engineering/quality/guidelines/reliable-tests/#promoting-an-existing-test-to-reliable) meaning it passes consistently in all pipelines, including merge requests. |
| `:requires_admin` | The test requires an admin account. Tests with the tag are excluded when run against Canary and Production environments. |
diff --git a/doc/install/aws/img/aws_ha_architecture_diagram.png b/doc/install/aws/img/aws_ha_architecture_diagram.png
index 4011150a358..2064b0f49ae 100644
--- a/doc/install/aws/img/aws_ha_architecture_diagram.png
+++ b/doc/install/aws/img/aws_ha_architecture_diagram.png
Binary files differ
diff --git a/doc/install/aws/index.md b/doc/install/aws/index.md
index c05d8b4b0da..061030765a3 100644
--- a/doc/install/aws/index.md
+++ b/doc/install/aws/index.md
@@ -543,7 +543,7 @@ If everything looks good, you should be able to reach GitLab in your browser.
### Setting up Gitaly
-CAUTION: **Caution:** In this architecture, having a single Gitaly server creates a single point of failure. This limitation will be removed once [Gitaly HA](https://gitlab.com/groups/gitlab-org/-/epics/842) is released.
+CAUTION: **Caution:** In this architecture, having a single Gitaly server creates a single point of failure. This limitation will be removed once [Gitaly HA](https://gitlab.com/groups/gitlab-org/-/epics/842) is released.
Gitaly is a service that provides high-level RPC access to Git repositories.
It should be enabled and configured on a separate EC2 instance in one of the
diff --git a/doc/integration/elasticsearch.md b/doc/integration/elasticsearch.md
index c2f4fff0ce3..e7667ea8080 100644
--- a/doc/integration/elasticsearch.md
+++ b/doc/integration/elasticsearch.md
@@ -54,7 +54,7 @@ The way you install the Go indexer depends on your version of GitLab:
### GitLab Omnibus
-Since GitLab 11.8 the Go indexer is included in GitLab Omnibus.
+Since GitLab 11.8 the Go indexer is included in GitLab Omnibus.
The former Ruby-based indexer was removed in [GitLab 12.3](https://gitlab.com/gitlab-org/gitlab/issues/6481).
### From source
diff --git a/doc/integration/img/jira_dev_panel_jira_setup_1-1.png b/doc/integration/img/jira_dev_panel_jira_setup_1-1.png
index e3c6c01c153..cef903ac9b4 100644
--- a/doc/integration/img/jira_dev_panel_jira_setup_1-1.png
+++ b/doc/integration/img/jira_dev_panel_jira_setup_1-1.png
Binary files differ
diff --git a/doc/integration/img/jira_dev_panel_setup_com_1.png b/doc/integration/img/jira_dev_panel_setup_com_1.png
index 906e4aa16cb..18f0d5da043 100644
--- a/doc/integration/img/jira_dev_panel_setup_com_1.png
+++ b/doc/integration/img/jira_dev_panel_setup_com_1.png
Binary files differ
diff --git a/doc/integration/img/jira_dev_panel_setup_com_2.png b/doc/integration/img/jira_dev_panel_setup_com_2.png
index 002a9140968..31dc13e1271 100644
--- a/doc/integration/img/jira_dev_panel_setup_com_2.png
+++ b/doc/integration/img/jira_dev_panel_setup_com_2.png
Binary files differ
diff --git a/doc/integration/img/jira_dev_panel_setup_com_3.png b/doc/integration/img/jira_dev_panel_setup_com_3.png
index c4e748c38cf..eb3c573a4bb 100644
--- a/doc/integration/img/jira_dev_panel_setup_com_3.png
+++ b/doc/integration/img/jira_dev_panel_setup_com_3.png
Binary files differ
diff --git a/doc/legal/corporate_contributor_license_agreement.md b/doc/legal/corporate_contributor_license_agreement.md
index c8782a2cfc2..018c4b575b5 100644
--- a/doc/legal/corporate_contributor_license_agreement.md
+++ b/doc/legal/corporate_contributor_license_agreement.md
@@ -21,7 +21,7 @@ You accept and agree to the following terms and conditions for Your present and
- **Contributions:**
You represent that each of Your Contributions is Your original creation.
-
+
Should You wish to submit work that is not Your original creation, You may submit it to GitLab B.V. separately from any Contribution, identifying the complete details of its source and of any license or other restriction (including, but not limited to, related patents, trademarks, and license agreements) of which you are personally aware, and conspicuously marking the work as "Submitted on behalf of a third-party: (named here)".
You are not expected to provide support for Your Contributions, except to the extent You desire to provide support. You may provide support for free, for a fee, or not at all. Unless required by applicable law or agreed to in writing, You provide Your Contributions on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/doc/security/webhooks.md b/doc/security/webhooks.md
index 7313cffdd13..bd05cbff05e 100644
--- a/doc/security/webhooks.md
+++ b/doc/security/webhooks.md
@@ -71,16 +71,24 @@ use IDNA encoding.
The whitelist can hold a maximum of 1000 entries. Each entry can be a maximum of
255 characters.
+You can whitelist a particular port by specifying it in the whitelist entry.
+For example `127.0.0.1:8080` will only allow connections to port 8080 on `127.0.0.1`.
+If no port is mentioned, all ports on that IP/domain are whitelisted. An IP range
+will whitelist all ports on all IPs in that range.
+
Example:
```text
example.com;gitlab.example.com
127.0.0.1,1:0:0:0:0:0:0:1
127.0.0.0/8 1:0:0:0:0:0:0:0/124
+[1:0:0:0:0:0:0:1]:8080
+127.0.0.1:8080
+example.com:8080
```
NOTE: **Note:**
-Wildcards (`*.example.com`) and ports (`127.0.0.1:3000`) are not currently supported.
+Wildcards (`*.example.com`) are not currently supported.
<!-- ## Troubleshooting
diff --git a/doc/subscriptions/index.md b/doc/subscriptions/index.md
index 0ca05fe0cda..925f162d0fe 100644
--- a/doc/subscriptions/index.md
+++ b/doc/subscriptions/index.md
@@ -389,7 +389,7 @@ To purchase additional minutes for your personal namespace:
1. Click your avatar, then go to **Settings > Pipeline quota**.
1. Locate the subscription card that's linked to your personal namespace on GitLab.com, click **Buy more CI minutes**, and complete the details about the transaction. Once we have processed your payment, the extra CI minutes will be synced to your Group.
-1. To confirm the available CI minutes for your personal projects, click your avatar, then go to **Settings > Pipeline quota**.
+1. To confirm the available CI minutes for your personal projects, click your avatar, then go to **Settings > Pipeline quota**.
The **Additional minutes** displayed now includes the purchased additional CI minutes, plus any minutes rolled over from last month.
Be aware that:
diff --git a/doc/topics/git/numerous_undo_possibilities_in_git/index.md b/doc/topics/git/numerous_undo_possibilities_in_git/index.md
index cea052f3a90..3b93c978931 100644
--- a/doc/topics/git/numerous_undo_possibilities_in_git/index.md
+++ b/doc/topics/git/numerous_undo_possibilities_in_git/index.md
@@ -253,7 +253,7 @@ In our example we will end up with commit `B`, that introduced bug/error. We hav
- Undo changes on a single file or directory from commit `B`, but retain them in the unstaged state:
```shell
- git reset commit-B-id <file>
+ git reset commit-B-id <file>
```
- There is one command we also must not forget: **creating a new branch**
@@ -487,8 +487,8 @@ git filter-branch --tree-filter 'rm filename' HEAD
Since `git filter-branch` command might be slow on big repositories, there are
tools that can use some of Git specifics to enable faster execution of common
tasks (which is exactly what removing sensitive information file is about).
-An alternative is the open source community-maintained tool [BFG][bfg-repo-cleaner].
-Keep in mind that these tools are faster because they do not provide the same
+An alternative is the open source community-maintained tool [BFG][bfg-repo-cleaner].
+Keep in mind that these tools are faster because they do not provide the same
feature set as `git filter-branch` does, but focus on specific use cases.
## Conclusion
diff --git a/doc/user/admin_area/settings/img/admin_package_registry_npm_package_requests_forward.png b/doc/user/admin_area/settings/img/admin_package_registry_npm_package_requests_forward.png
index 3cd2e1adc29..b6068f5d19b 100644
--- a/doc/user/admin_area/settings/img/admin_package_registry_npm_package_requests_forward.png
+++ b/doc/user/admin_area/settings/img/admin_package_registry_npm_package_requests_forward.png
Binary files differ
diff --git a/doc/user/admin_area/settings/img/gitaly_timeouts.png b/doc/user/admin_area/settings/img/gitaly_timeouts.png
index 82b2889b0d5..28394d238f7 100644
--- a/doc/user/admin_area/settings/img/gitaly_timeouts.png
+++ b/doc/user/admin_area/settings/img/gitaly_timeouts.png
Binary files differ
diff --git a/doc/user/analytics/img/code_review_analytics_v12_8.png b/doc/user/analytics/img/code_review_analytics_v12_8.png
index 228e03e628a..3b23e74130a 100644
--- a/doc/user/analytics/img/code_review_analytics_v12_8.png
+++ b/doc/user/analytics/img/code_review_analytics_v12_8.png
Binary files differ
diff --git a/doc/user/discussions/img/suggestion_code_block_output_v12_8.png b/doc/user/discussions/img/suggestion_code_block_output_v12_8.png
index 74833253aa0..6f29107146d 100644
--- a/doc/user/discussions/img/suggestion_code_block_output_v12_8.png
+++ b/doc/user/discussions/img/suggestion_code_block_output_v12_8.png
Binary files differ
diff --git a/doc/user/group/epics/img/epic_view_roadmap_v12_9.png b/doc/user/group/epics/img/epic_view_roadmap_v12_9.png
index b85f1806123..035adc5e7ac 100644
--- a/doc/user/group/epics/img/epic_view_roadmap_v12_9.png
+++ b/doc/user/group/epics/img/epic_view_roadmap_v12_9.png
Binary files differ
diff --git a/doc/user/group/issues_analytics/img/issues_created_per_month_v12_8.png b/doc/user/group/issues_analytics/img/issues_created_per_month_v12_8.png
index b7dc2d3da8d..fccfa949779 100644
--- a/doc/user/group/issues_analytics/img/issues_created_per_month_v12_8.png
+++ b/doc/user/group/issues_analytics/img/issues_created_per_month_v12_8.png
Binary files differ
diff --git a/doc/user/group/roadmap/img/roadmap_view_v12_9.png b/doc/user/group/roadmap/img/roadmap_view_v12_9.png
index 3aa8cbb8332..093e8af8702 100644
--- a/doc/user/group/roadmap/img/roadmap_view_v12_9.png
+++ b/doc/user/group/roadmap/img/roadmap_view_v12_9.png
Binary files differ
diff --git a/doc/user/img/markdown_copy_from_spreadsheet_v12_7.png b/doc/user/img/markdown_copy_from_spreadsheet_v12_7.png
index dccd6f10450..637ad49b6b5 100644
--- a/doc/user/img/markdown_copy_from_spreadsheet_v12_7.png
+++ b/doc/user/img/markdown_copy_from_spreadsheet_v12_7.png
Binary files differ
diff --git a/doc/user/img/markdown_paste_table_v12_7.png b/doc/user/img/markdown_paste_table_v12_7.png
index d3ba61da7d7..919599723dd 100644
--- a/doc/user/img/markdown_paste_table_v12_7.png
+++ b/doc/user/img/markdown_paste_table_v12_7.png
Binary files differ
diff --git a/doc/user/packages/container_registry/img/expiration-policy-app.png b/doc/user/packages/container_registry/img/expiration-policy-app.png
index e353fe27b2a..e2d3d668e38 100644
--- a/doc/user/packages/container_registry/img/expiration-policy-app.png
+++ b/doc/user/packages/container_registry/img/expiration-policy-app.png
Binary files differ
diff --git a/doc/user/packages/nuget_repository/img/visual_studio_adding_nuget_source.png b/doc/user/packages/nuget_repository/img/visual_studio_adding_nuget_source.png
index 94b037ced42..7397403f4bf 100644
--- a/doc/user/packages/nuget_repository/img/visual_studio_adding_nuget_source.png
+++ b/doc/user/packages/nuget_repository/img/visual_studio_adding_nuget_source.png
Binary files differ
diff --git a/doc/user/packages/nuget_repository/img/visual_studio_nuget_source_added.png b/doc/user/packages/nuget_repository/img/visual_studio_nuget_source_added.png
index d2f4791a25a..e4f6068f28c 100644
--- a/doc/user/packages/nuget_repository/img/visual_studio_nuget_source_added.png
+++ b/doc/user/packages/nuget_repository/img/visual_studio_nuget_source_added.png
Binary files differ
diff --git a/doc/user/project/clusters/img/kubernetes_pod_logs_v12_9.png b/doc/user/project/clusters/img/kubernetes_pod_logs_v12_9.png
index 6e5cf1af227..02b7cad1e3f 100644
--- a/doc/user/project/clusters/img/kubernetes_pod_logs_v12_9.png
+++ b/doc/user/project/clusters/img/kubernetes_pod_logs_v12_9.png
Binary files differ
diff --git a/doc/user/project/clusters/serverless/img/function-list_v12_7.png b/doc/user/project/clusters/serverless/img/function-list_v12_7.png
index e7bd3439643..f2a27ce7b0f 100644
--- a/doc/user/project/clusters/serverless/img/function-list_v12_7.png
+++ b/doc/user/project/clusters/serverless/img/function-list_v12_7.png
Binary files differ
diff --git a/doc/user/project/clusters/serverless/img/sam-api-endpoint.png b/doc/user/project/clusters/serverless/img/sam-api-endpoint.png
index 695d975387f..3407b2684fd 100644
--- a/doc/user/project/clusters/serverless/img/sam-api-endpoint.png
+++ b/doc/user/project/clusters/serverless/img/sam-api-endpoint.png
Binary files differ
diff --git a/doc/user/project/clusters/serverless/img/sam-complete-raw.png b/doc/user/project/clusters/serverless/img/sam-complete-raw.png
index 1098c1bb93f..1130cd29d56 100644
--- a/doc/user/project/clusters/serverless/img/sam-complete-raw.png
+++ b/doc/user/project/clusters/serverless/img/sam-complete-raw.png
Binary files differ
diff --git a/doc/user/project/img/deploy_boards_landing_page.png b/doc/user/project/img/deploy_boards_landing_page.png
index 73b3724d657..bed5f11018e 100644
--- a/doc/user/project/img/deploy_boards_landing_page.png
+++ b/doc/user/project/img/deploy_boards_landing_page.png
Binary files differ
diff --git a/doc/user/project/img/issue_boards_blocked_icon_v12_8.png b/doc/user/project/img/issue_boards_blocked_icon_v12_8.png
index ede57b760ed..779f643ba56 100644
--- a/doc/user/project/img/issue_boards_blocked_icon_v12_8.png
+++ b/doc/user/project/img/issue_boards_blocked_icon_v12_8.png
Binary files differ
diff --git a/doc/user/project/img/issue_boards_multi_select.png b/doc/user/project/img/issue_boards_multi_select_v12_4.png
index eebe06b04ae..eebe06b04ae 100644
--- a/doc/user/project/img/issue_boards_multi_select.png
+++ b/doc/user/project/img/issue_boards_multi_select_v12_4.png
Binary files differ
diff --git a/doc/user/project/img/labels_key_value_v12_1.png b/doc/user/project/img/labels_key_value_v12_1.png
index 82a6856bca7..ccda944a647 100644
--- a/doc/user/project/img/labels_key_value_v12_1.png
+++ b/doc/user/project/img/labels_key_value_v12_1.png
Binary files differ
diff --git a/doc/user/project/integrations/img/grafana_embedded.png b/doc/user/project/integrations/img/grafana_embedded.png
index bc9018c97af..c7946aa4b10 100644
--- a/doc/user/project/integrations/img/grafana_embedded.png
+++ b/doc/user/project/integrations/img/grafana_embedded.png
Binary files differ
diff --git a/doc/user/project/issue_board.md b/doc/user/project/issue_board.md
index dd51d303294..464929a7e6c 100644
--- a/doc/user/project/issue_board.md
+++ b/doc/user/project/issue_board.md
@@ -180,18 +180,6 @@ These are shortcuts to your last 4 visited boards.
When you're revisiting an issue board in a project or group with multiple boards,
GitLab will automatically load the last board you visited.
-### Multi-select Issue Cards
-
-As the name suggest, multi-select issue cards allows more than one issue card
-to be dragged and dropped across different lists. This becomes helpful while
-moving and grooming a lot of issues at once.
-
-You can multi-select an issue card by pressing `CTRL` + `Left mouse click` on
-Windows or `CMD` + `Left mouse click` on MacOS. Once done, start by dragging one
-of the issue card you have selected and drop it in the new list you want.
-
-![Multi-select Issue Cards](img/issue_boards_multi_select.png)
-
### Configurable Issue Boards **(STARTER)**
> Introduced in [GitLab Starter Edition 10.2](https://about.gitlab.com/releases/2017/11/22/gitlab-10-2-released/#issue-boards-configuration).
@@ -467,6 +455,19 @@ When dragging issues between lists, different behavior occurs depending on the s
| From label `A` list | `A` removed | Issue closed | `A` removed<br/>`B` added | `Bob` assigned |
| From assignee `Alice` list | `Alice` unassigned | Issue closed | `B` added | `Alice` unassigned<br/>`Bob` assigned |
+### Multi-select issue cards
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/18954) in GitLab 12.4.
+
+You can select multiple issue cards, then drag the group to another position within the list, or to another list. This makes it faster to reorder many issues at once.
+
+To select and move multiple cards:
+
+1. Select each card with <kbd>Ctrl</kbd>+`Click` on Windows or Linux, or <kbd>Cmd</kbd>+`Click` on MacOS.
+1. Drag one of the selected cards to another position or list and all selected cards will be moved.
+
+![Multi-select Issue Cards](img/issue_boards_multi_select_v12_4.png)
+
## Tips
A few things to remember:
diff --git a/doc/user/project/issues/img/related_issue_block_v12_8.png b/doc/user/project/issues/img/related_issue_block_v12_8.png
index 02d70868abc..ce261f26ce6 100644
--- a/doc/user/project/issues/img/related_issue_block_v12_8.png
+++ b/doc/user/project/issues/img/related_issue_block_v12_8.png
Binary files differ
diff --git a/doc/user/project/issues/img/related_issues_add_v12_8.png b/doc/user/project/issues/img/related_issues_add_v12_8.png
index 5d6fa218426..8a06d005a5f 100644
--- a/doc/user/project/issues/img/related_issues_add_v12_8.png
+++ b/doc/user/project/issues/img/related_issues_add_v12_8.png
Binary files differ
diff --git a/doc/user/project/issues/img/related_issues_remove_v12_8.png b/doc/user/project/issues/img/related_issues_remove_v12_8.png
index bf35bec1bec..a8dff4c7052 100644
--- a/doc/user/project/issues/img/related_issues_remove_v12_8.png
+++ b/doc/user/project/issues/img/related_issues_remove_v12_8.png
Binary files differ
diff --git a/doc/user/project/merge_requests/img/approvals_premium_mr_widget_v12_7.png b/doc/user/project/merge_requests/img/approvals_premium_mr_widget_v12_7.png
index f9348b0eefc..164779a8450 100644
--- a/doc/user/project/merge_requests/img/approvals_premium_mr_widget_v12_7.png
+++ b/doc/user/project/merge_requests/img/approvals_premium_mr_widget_v12_7.png
Binary files differ
diff --git a/doc/user/project/merge_requests/img/mr_approvals_by_code_owners_v12_7.png b/doc/user/project/merge_requests/img/mr_approvals_by_code_owners_v12_7.png
index c2e5714e78d..669148a41d8 100644
--- a/doc/user/project/merge_requests/img/mr_approvals_by_code_owners_v12_7.png
+++ b/doc/user/project/merge_requests/img/mr_approvals_by_code_owners_v12_7.png
Binary files differ
diff --git a/doc/user/project/merge_requests/img/scoped_to_protected_branch_v12_8.png b/doc/user/project/merge_requests/img/scoped_to_protected_branch_v12_8.png
index 08a24e9f28e..9446ed66c38 100644
--- a/doc/user/project/merge_requests/img/scoped_to_protected_branch_v12_8.png
+++ b/doc/user/project/merge_requests/img/scoped_to_protected_branch_v12_8.png
Binary files differ
diff --git a/doc/user/project/releases/img/releases_count_v12_8.png b/doc/user/project/releases/img/releases_count_v12_8.png
index fae3b58d8e3..e70f623d508 100644
--- a/doc/user/project/releases/img/releases_count_v12_8.png
+++ b/doc/user/project/releases/img/releases_count_v12_8.png
Binary files differ
diff --git a/doc/user/project/releases/img/upcoming_release_v12_7.png b/doc/user/project/releases/img/upcoming_release_v12_7.png
index 4ff8fad98f9..458aa66f6fe 100644
--- a/doc/user/project/releases/img/upcoming_release_v12_7.png
+++ b/doc/user/project/releases/img/upcoming_release_v12_7.png
Binary files differ
diff --git a/doc/user/project/repository/img/forking_workflow_fork_button.png b/doc/user/project/repository/img/forking_workflow_fork_button.png
index 74b68a7e61c..eea62892232 100644
--- a/doc/user/project/repository/img/forking_workflow_fork_button.png
+++ b/doc/user/project/repository/img/forking_workflow_fork_button.png
Binary files differ
diff --git a/doc/user/project/repository/reducing_the_repo_size_using_git.md b/doc/user/project/repository/reducing_the_repo_size_using_git.md
index a024f8eff97..16bffe5417d 100644
--- a/doc/user/project/repository/reducing_the_repo_size_using_git.md
+++ b/doc/user/project/repository/reducing_the_repo_size_using_git.md
@@ -19,7 +19,7 @@ Unfortunately, it's not so easy and that workflow won't work. Deleting files in
a commit doesn't actually reduce the size of the repo since the earlier commits
and blobs are still around. What you need to do is rewrite history with Git's
[`filter-branch` option](https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History#The-Nuclear-Option:-filter-branch),
-or an open source community-maintained tool like the
+or an open source community-maintained tool like the
[BFG](https://rtyley.github.io/bfg-repo-cleaner/).
Note that even with that method, until `git gc` runs on the GitLab side, the