Skip to content
代码片段 群组 项目
提交 c807e6f5 编辑于 作者: Lorena Ciutacu's avatar Lorena Ciutacu
浏览文件

Merge branch 'lohrc-master-patch-52852' into 'master'

Update doc/user/workspace/index.md

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/108567



Merged-by: default avatarLorena Ciutacu <lciutacu@gitlab.com>
Approved-by: default avatarLorena Ciutacu <lciutacu@gitlab.com>
Co-authored-by: default avatarChristina Lohr <clohr@gitlab.com>
No related branches found
No related tags found
无相关合并请求
...@@ -4,7 +4,7 @@ group: Organization ...@@ -4,7 +4,7 @@ group: Organization
info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
--- ---
# Workspace # Organization
DISCLAIMER: DISCLAIMER:
This page contains information related to upcoming products, features, and functionality. This page contains information related to upcoming products, features, and functionality.
...@@ -15,9 +15,9 @@ The development, release, and timing of any products, features, or functionality ...@@ -15,9 +15,9 @@ The development, release, and timing of any products, features, or functionality
sole discretion of GitLab Inc. sole discretion of GitLab Inc.
NOTE: NOTE:
Workspace is in development. Organization is in development.
Workspace will be above the [top-level namespaces](../namespace/index.md) for you to manage Organization will be above the [top-level namespaces](../namespace/index.md) for you to manage
everything you do as a GitLab administrator, including: everything you do as a GitLab administrator, including:
- Defining and applying settings to all of your groups, subgroups, and projects. - Defining and applying settings to all of your groups, subgroups, and projects.
...@@ -26,11 +26,11 @@ everything you do as a GitLab administrator, including: ...@@ -26,11 +26,11 @@ everything you do as a GitLab administrator, including:
Our goal is to reach feature parity between SaaS and self-managed installations, with all Our goal is to reach feature parity between SaaS and self-managed installations, with all
[Admin Area settings](/ee/user/admin_area/settings/index.md) moving to either: [Admin Area settings](/ee/user/admin_area/settings/index.md) moving to either:
- Groups. Available in the Workspace, top-level groups, and subgroups. - Groups. Available in the Organization, and subgroups.
- Hardware Controls. For functionality that does not apply to groups, Hardware Controls are only - 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. applicable to self-managed installations. There is one Hardware Controls section per installation.
For more information about the state of workspace development, For more information about the state of organization development,
see [epic 9265](https://gitlab.com/groups/gitlab-org/-/epics/9265). see [epic 9265](https://gitlab.com/groups/gitlab-org/-/epics/9265).
<i class="fa fa-youtube-play youtube" aria-hidden="true"></i> <i class="fa fa-youtube-play youtube" aria-hidden="true"></i>
...@@ -39,4 +39,4 @@ For a video introduction to the new hierarchy concept for groups and projects fo ...@@ -39,4 +39,4 @@ For a video introduction to the new hierarchy concept for groups and projects fo
## Related topics ## Related topics
- [Workspace developer documentation](../../development/workspace/index.md) - [Organization developer documentation](../../development/workspace/index.md)
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册