Add latest changes from gitlab-org/gitlab@master

This commit is contained in:
GitLab Bot 2021-04-27 03:09:56 +00:00
parent be5b24c009
commit 427879bb37
3 changed files with 3 additions and 3 deletions

View file

@ -1 +1 @@
585cfd46d6be12237b640d19cbd730f3065e0ecc
08494e5d342f06281463abd6c2f688499ff77b7a

View file

@ -62,7 +62,7 @@ Gitaly comes pre-configured with Omnibus GitLab, which is a configuration
[suitable for up to 1000 users](../reference_architectures/1k_users.md). For:
- Omnibus GitLab installations for up to 2000 users, see [specific Gitaly configuration instructions](../reference_architectures/2k_users.md#configure-gitaly).
- Source installations or custom Gitaly installations, see [Configure Gitaly](#configure-gitaly).
- Source installations or custom Gitaly installations, see [Configure Gitaly](configure_gitaly.md).
GitLab installations for more than 2000 users should use Gitaly Cluster.

View file

@ -199,7 +199,7 @@ There are a few tools that can produce JUnit report format XML files in C/C++.
In the following example, `gtest` is used to generate the test reports.
If there are multiple `gtest` executables created for different architectures (`x86`, `x64` or `arm`),
you are required to run each test providing a unique filename. The results
are then be aggregated together.
are then aggregated together.
```yaml
cpp: