From 546ddc3f6ac96fdf09934390a938bb391d07dc94 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 3 Apr 2020 12:09:52 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- doc/administration/img/repository_storages_admin_ui.png | Bin 20897 -> 0 bytes .../img/repository_storages_admin_ui_v12_10.png | Bin 0 -> 94975 bytes doc/administration/repository_storage_paths.md | 14 +++++++------- doc/administration/troubleshooting/debug.md | 4 +--- 4 files changed, 8 insertions(+), 10 deletions(-) delete mode 100644 doc/administration/img/repository_storages_admin_ui.png create mode 100644 doc/administration/img/repository_storages_admin_ui_v12_10.png (limited to 'doc/administration') diff --git a/doc/administration/img/repository_storages_admin_ui.png b/doc/administration/img/repository_storages_admin_ui.png deleted file mode 100644 index 51b2f5f8c15..00000000000 Binary files a/doc/administration/img/repository_storages_admin_ui.png and /dev/null differ diff --git a/doc/administration/img/repository_storages_admin_ui_v12_10.png b/doc/administration/img/repository_storages_admin_ui_v12_10.png new file mode 100644 index 00000000000..b66e2c598bc Binary files /dev/null and b/doc/administration/img/repository_storages_admin_ui_v12_10.png differ diff --git a/doc/administration/repository_storage_paths.md b/doc/administration/repository_storage_paths.md index e308242b1f6..857fb0b6a90 100644 --- a/doc/administration/repository_storage_paths.md +++ b/doc/administration/repository_storage_paths.md @@ -104,16 +104,16 @@ working, you can remove the `repos_path` line. Note that Omnibus stores the repositories in a `repositories` subdirectory of the `git-data` directory. -## Choose where new project repositories will be stored +## Choose where new repositories will be stored -Once you set the multiple storage paths, you can choose where new projects will -be stored under **Admin Area > Settings > Repository > Repository storage > Storage -nodes for new projects**. +Once you set the multiple storage paths, you can choose where new repositories +will be stored under **Admin Area > Settings > Repository > +Repository storage > Storage nodes for new repositories**. -![Choose repository storage path in Admin Area](img/repository_storages_admin_ui.png) +![Choose repository storage path in Admin Area](img/repository_storages_admin_ui_v12_10.png) -Beginning with GitLab 8.13.4, multiple paths can be chosen. New projects will be -randomly placed on one of the selected paths. +Beginning with GitLab 8.13.4, multiple paths can be chosen. New repositories +will be randomly placed on one of the selected paths. [ce-4578]: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/4578 [restart-gitlab]: restart_gitlab.md#installations-from-source diff --git a/doc/administration/troubleshooting/debug.md b/doc/administration/troubleshooting/debug.md index 78aa10489ce..6a22b22a5be 100644 --- a/doc/administration/troubleshooting/debug.md +++ b/doc/administration/troubleshooting/debug.md @@ -156,9 +156,7 @@ unicorn['worker_timeout'] = 300 For source installations, edit `config/unicorn.rb`. -[Reconfigure] GitLab for the changes to take effect. - -[Reconfigure]: ../restart_gitlab.md#omnibus-gitlab-reconfigure +[Reconfigure](../restart_gitlab.md#omnibus-gitlab-reconfigure) GitLab for the changes to take effect. #### Troubleshooting without affecting other users -- cgit v1.2.1