diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-22 06:09:11 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-22 06:09:11 +0300 |
| commit | 2b2f7ac9bc0039b822c65c15c9e7e92ee0b4bb84 (patch) | |
| tree | 7f271a2ba7a7a7042828c412eb4785de577aa6df /doc/user/workspace | |
| parent | 1f4988374d6c9870044a93c51e2016853193e8cf (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user/workspace')
| -rw-r--r-- | doc/user/workspace/index.md | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/doc/user/workspace/index.md b/doc/user/workspace/index.md index 2ce30c645d5..02a4ae75308 100644 --- a/doc/user/workspace/index.md +++ b/doc/user/workspace/index.md @@ -11,15 +11,10 @@ Workspace will be above the [top-level namespaces](../group/index.md#namespaces) - Defining and applying settings to all of your groups, subgroups, and projects. - Aggregating data from all your groups, subgroups, and projects. -The functionality in the [Admin Area](../admin_area/index.md) of self-managed installations will be split up and go to: - -1. Groups (available in the Workspace, Top-level group namespaces, and Sub-groups) -1. Hardware Controls (for functionality that does not apply to groups) - Our goal is to reach feature parity between SaaS and Self-Managed installations, with all [Admin Area settings](/ee/user/admin_area/settings/) moving to either: -- Workspace (contains features relevant to both GitLab-managed and self-managed installations) with a dedicated Settings menu available within the left navigation bar. -- Hardware controls (only contains features relative to Self-Managed installations, with one per installation). +1. Groups (available in the Workspace, Top-level group namespaces, and Sub-groups) +1. Hardware Controls (for functionality that does not apply to Groups, Hardware Controls are only applicable to Self-managed Installations, there is one Hardware Controls section per installation) NOTE: Workspace is currently in development. |