diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-07 06:09:15 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-07 06:09:15 +0300 |
| commit | 7ba5b9babaa5802c39e686c57cbf4a3f4725c4b0 (patch) | |
| tree | 03a696c26f32e46faa46dd12d0a937d1d0d1cba4 /doc | |
| parent | b56027c9d80ac0e297ba8a43c81e8504172dbf9f (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/administration/geo/replication/troubleshooting.md | 6 | ||||
| -rw-r--r-- | doc/user/clusters/applications.md | 2 | ||||
| -rw-r--r-- | doc/user/project/web_ide/index.md | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/doc/administration/geo/replication/troubleshooting.md b/doc/administration/geo/replication/troubleshooting.md index 5ae199e374a..fae9705e935 100644 --- a/doc/administration/geo/replication/troubleshooting.md +++ b/doc/administration/geo/replication/troubleshooting.md @@ -486,9 +486,9 @@ to start again from scratch, there are a few steps that can help you: 1. Reset the Tracking Database ```shell - gitlab-rake geo:db:drop - gitlab-ctl reconfigure - gitlab-rake geo:db:setup + gitlab-rake geo:db:drop # on a secondary app node + gitlab-ctl reconfigure # on the tracking database node + gitlab-rake geo:db:setup # on a secondary app node ``` 1. Restart previously stopped services diff --git a/doc/user/clusters/applications.md b/doc/user/clusters/applications.md index 0d2a3ac3ed9..7cedd21edcb 100644 --- a/doc/user/clusters/applications.md +++ b/doc/user/clusters/applications.md @@ -52,7 +52,7 @@ Some applications are installable only for a project-level cluster. Support for installing these applications in a group-level cluster is planned for future releases. For updates, see [the issue tracking -progress](https://gitlab.com/gitlab-org/gitlab-foss/issues/51989). +progress](https://gitlab.com/gitlab-org/gitlab/-/issues/24411). CAUTION: **Caution:** If you have an existing Kubernetes cluster with Helm already installed, diff --git a/doc/user/project/web_ide/index.md b/doc/user/project/web_ide/index.md index 8680da3ad01..23b72e33aae 100644 --- a/doc/user/project/web_ide/index.md +++ b/doc/user/project/web_ide/index.md @@ -143,7 +143,7 @@ below. CAUTION: **Warning:** Interactive Web Terminals for the Web IDE is currently in **Beta**. -Shared Runners [do not yet support Interactive Web Terminals](https://gitlab.com/gitlab-org/gitlab-foss/issues/52611), +Shared Runners [do not yet support Interactive Web Terminals](https://gitlab.com/gitlab-org/gitlab/-/issues/24674), so you would need to use your own private Runner(s) to make use of this feature. [Interactive Web Terminals](../../../ci/interactive_web_terminal/index.md) |