diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-23 18:06:07 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-23 18:06:07 +0000 |
| commit | 7f0a4a64d0bc59b184ae3ee578adb6ebd3c48bf7 (patch) | |
| tree | 74aa541f76b8d7cd692982ce46c0013a9b666172 /doc | |
| parent | b3f7042d06c53e5d4b8cad42e1b2679d0450f1a7 (diff) | |
| download | gitlab-ce-7f0a4a64d0bc59b184ae3ee578adb6ebd3c48bf7.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/administration/geo/replication/using_a_geo_server.md | 8 | ||||
| -rw-r--r-- | doc/api/geo_nodes.md | 12 |
2 files changed, 18 insertions, 2 deletions
diff --git a/doc/administration/geo/replication/using_a_geo_server.md b/doc/administration/geo/replication/using_a_geo_server.md index 55c7e78da92..37982f2756c 100644 --- a/doc/administration/geo/replication/using_a_geo_server.md +++ b/doc/administration/geo/replication/using_a_geo_server.md @@ -10,8 +10,12 @@ Example of the output you will see when pushing to a **secondary** node: ```bash $ git push -> GitLab: You're pushing to a Geo secondary. -> GitLab: We'll help you by proxying this request to the primary: ssh://git@primary.geo/user/repo.git +remote: +remote: You're pushing to a Geo secondary. We'll help you by proxying this +remote: request to the primary: +remote: +remote: ssh://git@primary.geo/user/repo.git +remote: Everything up-to-date ``` diff --git a/doc/api/geo_nodes.md b/doc/api/geo_nodes.md index 5eba7f038ed..e44d69f1419 100644 --- a/doc/api/geo_nodes.md +++ b/doc/api/geo_nodes.md @@ -237,6 +237,10 @@ Example response: "container_repositories_synced_count": nil, "container_repositories_failed_count": nil, "container_repositories_synced_in_percentage": "0.00%", + "design_repositories_count": 3, + "design_repositories_synced_count": nil, + "design_repositories_failed_count": nil, + "design_repositories_synced_in_percentage": "0.00%", "projects_count": 41, "repositories_failed_count": nil, "repositories_synced_count": nil, @@ -304,6 +308,10 @@ Example response: "container_repositories_synced_count": nil, "container_repositories_failed_count": nil, "container_repositories_synced_in_percentage": "0.00%", + "design_repositories_count": 3, + "design_repositories_synced_count": nil, + "design_repositories_failed_count": nil, + "design_repositories_synced_in_percentage": "0.00%", "projects_count": 41, "repositories_failed_count": 1, "repositories_synced_count": 40, @@ -387,6 +395,10 @@ Example response: "container_repositories_synced_count": nil, "container_repositories_failed_count": nil, "container_repositories_synced_in_percentage": "0.00%", + "design_repositories_count": 3, + "design_repositories_synced_count": nil, + "design_repositories_failed_count": nil, + "design_repositories_synced_in_percentage": "0.00%", "projects_count": 41, "repositories_failed_count": 1, "repositories_synced_count": 40, |