diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-27 18:07:48 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-27 18:07:48 +0000 |
| commit | e20baee820ea2c76ee16980a98e8080f255d9035 (patch) | |
| tree | 6e13a73bee42b7ef310850d03982faebea17a0b1 /doc/administration | |
| parent | 71c5863d7b1ca9836a7d7703f35750cd726a9846 (diff) | |
| download | gitlab-ce-e20baee820ea2c76ee16980a98e8080f255d9035.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/administration')
| -rw-r--r-- | doc/administration/integration/terminal.md | 6 | ||||
| -rw-r--r-- | doc/administration/monitoring/gitlab_self_monitoring_project/index.md | 5 |
2 files changed, 3 insertions, 8 deletions
diff --git a/doc/administration/integration/terminal.md b/doc/administration/integration/terminal.md index 0aa42e630b9..251e4ded8b4 100644 --- a/doc/administration/integration/terminal.md +++ b/doc/administration/integration/terminal.md @@ -96,7 +96,5 @@ they will receive a `Connection failed` message. > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/8413) in GitLab 8.17. -Terminal sessions use long-lived connections; by default, these may last -forever. You can configure a maximum session time in the Admin Area of your -GitLab instance if you find this undesirable from a scalability or security -point of view. +Terminal sessions, by default, do not expire. +You can limit terminal session lifetime in your GitLab instance. To do so, navigate to **{admin}** [**Admin Area > Settings > Web terminal**](../../user/admin_area/settings/index.md#general), and set a `max session time`. diff --git a/doc/administration/monitoring/gitlab_self_monitoring_project/index.md b/doc/administration/monitoring/gitlab_self_monitoring_project/index.md index 2058aa4f01c..884bb44cfda 100644 --- a/doc/administration/monitoring/gitlab_self_monitoring_project/index.md +++ b/doc/administration/monitoring/gitlab_self_monitoring_project/index.md @@ -21,10 +21,7 @@ This project will be used for self monitoring your GitLab instance. 1. Navigate to **Admin Area > Settings > Metrics and profiling**, and expand the **Self monitoring** section. 1. Toggle the **Create Project** button on. -1. It can take a few seconds for the project to be created. After the project is -created, GitLab displays a message with a link to the project. The project -will also be linked in the help text above the **Create Project** button. You can also -find the project under **Projects > Your projects**. +1. Once your GitLab instance creates the project, you'll see a link to the project in the text above the **Create Project** toggle. You can also find it under **Projects > Your projects**. ## Deleting the self monitoring project |