Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-05-18 06:08:08 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-05-18 06:08:08 +0300
commit25861ffdce4061974732c8403992a0532433e012 (patch)
tree4ad5ad72832b28ff5be3cc1b31398bebe1e6a8f0
parentc65a2b8a6ce8e1147b738bca02be68f6401bee70 (diff)
Add latest changes from gitlab-org/gitlab@master
-rw-r--r--doc/administration/gitaly/praefect.md7
-rw-r--r--locale/gitlab.pot3
2 files changed, 9 insertions, 1 deletions
diff --git a/doc/administration/gitaly/praefect.md b/doc/administration/gitaly/praefect.md
index 29517d2a46e..944da7d4a77 100644
--- a/doc/administration/gitaly/praefect.md
+++ b/doc/administration/gitaly/praefect.md
@@ -2,7 +2,12 @@
type: reference
---
-# Gitaly Cluster
+# Gitaly Cluster **(PREMIUM)**
+
+NOTE: **Note:**
+Support for Gitaly Cluster is only available through [Priority
+Support](https://about.gitlab.com/support/#priority-support) for self-managed
+Premium and Ultimate customers.
[Gitaly](index.md), the service that provides storage for Git repositories, can
be run in a clustered configuration to increase fault tolerance. In this
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 7897870ff4d..06548367c04 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -16282,6 +16282,9 @@ msgstr ""
msgid "Project %{project_repo} could not be found"
msgstr ""
+msgid "Project & Group can not be assigned at the same time"
+msgstr ""
+
msgid "Project '%{project_name}' is being imported."
msgstr ""