From 427879bb37f843a577b07eb9fb2c83537f8c3c4b Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 27 Apr 2021 03:09:56 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- GITALY_SERVER_VERSION | 2 +- doc/administration/gitaly/index.md | 2 +- doc/ci/unit_test_reports.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 79d8b278a5f..f3537e0d902 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -585cfd46d6be12237b640d19cbd730f3065e0ecc +08494e5d342f06281463abd6c2f688499ff77b7a diff --git a/doc/administration/gitaly/index.md b/doc/administration/gitaly/index.md index 5e84f52bb5b..2ed98178d69 100644 --- a/doc/administration/gitaly/index.md +++ b/doc/administration/gitaly/index.md @@ -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. diff --git a/doc/ci/unit_test_reports.md b/doc/ci/unit_test_reports.md index 6550c88dd33..8980d32cc99 100644 --- a/doc/ci/unit_test_reports.md +++ b/doc/ci/unit_test_reports.md @@ -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: