From 6a1d11b8e014d08ff451ed19fe37aa049a56f843 Mon Sep 17 00:00:00 2001
From: Peter Hegman <phegman@gitlab.com>
Date: Mon, 20 Oct 2025 13:39:31 -0700
Subject: [PATCH] Update organization user docs

To remove out-dated documentation related to UI that has been
hidden
---
 .../general/components/visibility_level.vue   | 12 ---
 .../shared/components/new_edit_form.vue       | 14 ---
 doc/user/organization/_index.md               | 92 +++----------------
 locale/gitlab.pot                             |  6 --
 .../components/visibility_level_spec.js       | 11 ---
 .../shared/components/new_edit_form_spec.js   |  8 --
 6 files changed, 11 insertions(+), 132 deletions(-)

diff --git a/app/assets/javascripts/organizations/settings/general/components/visibility_level.vue b/app/assets/javascripts/organizations/settings/general/components/visibility_level.vue
index 46759dafbb242a..5ac92542ee76f9 100644
--- a/app/assets/javascripts/organizations/settings/general/components/visibility_level.vue
+++ b/app/assets/javascripts/organizations/settings/general/components/visibility_level.vue
@@ -5,14 +5,12 @@ import SettingsBlock from '~/vue_shared/components/settings/settings_block.vue';
 import VisibilityLevelRadioButtons from '~/visibility_level/components/visibility_level_radio_buttons.vue';
 import { ORGANIZATION_VISIBILITY_LEVEL_DESCRIPTIONS } from '~/visibility_level/constants';
 import { FORM_FIELD_VISIBILITY_LEVEL } from '~/organizations/shared/constants';
-import HelpPageLink from '~/vue_shared/components/help_page_link/help_page_link.vue';
 
 export default {
   name: 'VisibilityLevel',
   components: {
     GlForm,
     GlFormFields,
-    HelpPageLink,
     SettingsBlock,
     VisibilityLevelRadioButtons,
   },
@@ -21,7 +19,6 @@ export default {
   fields: {
     [FORM_FIELD_VISIBILITY_LEVEL]: {
       label: __('Visibility level'),
-      labelDescription: s__('Organization|Who can see this organization?'),
     },
   },
   i18n: {
@@ -29,7 +26,6 @@ export default {
       title: __('Visibility'),
       description: s__('Organization|Choose organization visibility level.'),
     },
-    learnMore: s__('Organization|Learn more about visibility levels'),
   },
   ORGANIZATION_VISIBILITY_LEVEL_DESCRIPTIONS,
   props: {
@@ -68,14 +64,6 @@ export default {
     <template #default>
       <gl-form :id="$options.formId">
         <gl-form-fields v-model="formValues" :form-id="$options.formId" :fields="$options.fields">
-          <template #group(visibilityLevel)-label-description>
-            {{ $options.fields.visibilityLevel.labelDescription }}
-            <help-page-link
-              href="user/organization/_index"
-              anchor="view-an-organizations-visibility-level"
-              >{{ $options.i18n.learnMore }}</help-page-link
-            >.
-          </template>
           <template #input(visibilityLevel)="{ value, input }">
             <visibility-level-radio-buttons
               :checked="value"
diff --git a/app/assets/javascripts/organizations/shared/components/new_edit_form.vue b/app/assets/javascripts/organizations/shared/components/new_edit_form.vue
index 0f4ed7117bbed7..51065af876bbbe 100644
--- a/app/assets/javascripts/organizations/shared/components/new_edit_form.vue
+++ b/app/assets/javascripts/organizations/shared/components/new_edit_form.vue
@@ -7,7 +7,6 @@ import AvatarUploadDropzone from '~/organizations/shared/components/avatar_uploa
 import MarkdownField from '~/vue_shared/components/markdown/field.vue';
 import { RESTRICTED_TOOLBAR_ITEMS_BASIC_EDITING_ONLY } from '~/vue_shared/components/markdown/constants';
 import { helpPagePath } from '~/helpers/help_page_helper';
-import HelpPageLink from '~/vue_shared/components/help_page_link/help_page_link.vue';
 import VisibilityLevelRadioButtons from '~/visibility_level/components/visibility_level_radio_buttons.vue';
 import {
   ORGANIZATION_VISIBILITY_LEVEL_DESCRIPTIONS,
@@ -35,7 +34,6 @@ export default {
     OrganizationUrlField,
     AvatarUploadDropzone,
     MarkdownField,
-    HelpPageLink,
     VisibilityLevelRadioButtons,
   },
   i18n: {
@@ -152,10 +150,6 @@ export default {
         },
         [FORM_FIELD_VISIBILITY_LEVEL]: {
           label: s__('Organization|Organization visibility level'),
-          labelDescription: {
-            text: s__('Organization|Who can see this organization?'),
-            linkText: s__('Organization|Learn more about visibility levels'),
-          },
         },
       };
 
@@ -259,14 +253,6 @@ export default {
         />
       </template>
 
-      <template #group(visibilityLevel)-label-description>
-        {{ fields.visibilityLevel.labelDescription.text }}
-        <help-page-link
-          href="user/organization/_index"
-          anchor="view-an-organizations-visibility-level"
-          >{{ fields.visibilityLevel.labelDescription.linkText }}</help-page-link
-        >.
-      </template>
       <template #input(visibilityLevel)="{ value, input }">
         <visibility-level-radio-buttons
           :checked="value"
diff --git a/doc/user/organization/_index.md b/doc/user/organization/_index.md
index 801fce627cbcb4..1cb9ef62ff33c5 100644
--- a/doc/user/organization/_index.md
+++ b/doc/user/organization/_index.md
@@ -9,7 +9,6 @@ description: Namespace hierarchy.
 {{< history >}}
 
 - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/409913) in GitLab 16.1 [with a flag](../../administration/feature_flags/_index.md) named `ui_for_organizations`. Disabled by default.
-- [Enabled on GitLab Self-Managed](https://gitlab.com/gitlab-org/gitlab/-/issues/409913) in 16.1.
 
 {{< /history >}}
 
@@ -38,17 +37,18 @@ everything you do as a GitLab administrator, including:
 For more information about the state of organization development,
 see [epic 9265](https://gitlab.com/groups/gitlab-org/-/epics/9265).
 
-## View organizations
+## Create an organization
 
-To view the organizations you have access to:
+{{< history >}}
 
-- On the left sidebar, select **Organizations**.
+- [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/441531) in GitLab 16.11 [with a flag](../../administration/feature_flags/_index.md) named `allow_organization_creation`. Disabled by default.
+- [Consolidated](https://gitlab.com/gitlab-org/gitlab/-/issues/549062) with `organization_switching` feature flag in GitLab 18.4. Disabled by default.
 
-## Create an organization
+{{< /history >}}
 
 {{< alert type="note" >}}
 
-Support for only private organizations is proposed for [cells 1.0](https://gitlab.com/groups/gitlab-org/-/epics/12383).
+Creating organizations is only supported internally for GitLab team members.
 
 {{< /alert >}}
 
@@ -59,43 +59,17 @@ Support for only private organizations is proposed for [cells 1.0](https://gitla
 1. In the **Organization avatar** field, select **Upload** or drag and drop an avatar.
 1. Select **Create organization**.
 
-## Edit an organization's name
-
-1. On the left sidebar, select **Organizations** and find the organization you want to edit.
-1. Select **Settings** > **General**.
-1. In the **Organization name** text box, edit the name.
-1. In the **Organization description** text box, edit the description. Supports a [limited subset of Markdown](#supported-markdown-for-organization-description).
-1. In the **Organization avatar** field, if an avatar is:
-   - Selected, select **Remove avatar** to remove.
-   - Not selected, select **Upload** or drag and drop an avatar.
-1. Select **Save changes**.
-
-## Change an organization's URL
-
-1. On the left sidebar, select **Organizations** and find the organization whose URL you want to change.
-1. Select **Settings** > **General**.
-1. Expand the **Advanced** section.
-1. In the **Organization URL** text box, edit the URL.
-1. Select **Change organization URL**.
-
-## View an organization's visibility level
-
-{{< alert type="note" >}}
-
-Support for only private organizations is proposed for [cells 1.0](https://gitlab.com/groups/gitlab-org/-/epics/12383).
+## Switch organizations
 
-{{< /alert >}}
+{{< history >}}
 
-1. On the left sidebar, select **Organizations** and find your organization.
-1. Select **Settings** > **General**.
-1. Expand the **Visibility** section.
+- [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/440741) in GitLab 16.11 [with a flag](../../administration/feature_flags/_index.md) named `organization_switching`. Disabled by default.
 
-## Switch organizations
+{{< /history >}}
 
 {{< alert type="note" >}}
 
-Switching between organizations is not supported in cells 1.0.
-Support for switching organizations is proposed for [cells 1.5](https://gitlab.com/groups/gitlab-org/-/epics/12505).
+Switching between organizations is only supported internally for GitLab team members. If you are not a member of multiple organizations you will not see the switcher.
 
 {{< /alert >}}
 
@@ -103,50 +77,6 @@ To switch organizations:
 
 - On the left sidebar, in the upper corner, from the **Current organization** dropdown list select the organization you want to switch to.
 
-## Manage groups and projects
-
-1. On the left sidebar, select **Organizations** and find the organization you want to manage.
-1. Select **Manage** > **Groups and projects**.
-1. Optional. Filter the results:
-   - To search for specific groups or projects, in the search box enter your search term (minimum three characters).
-   - To view only groups or projects, from the **Display** dropdown list select an option.
-1. Optional. To sort the results by name, date created, or date updated, from the dropdown list select an option. Then select ascending ({{< icon name="sort-lowest" >}}) or descending ({{< icon name="sort-highest" >}}) order.
-
-## Create a group in an organization
-
-1. On the left sidebar, select **Organizations** and find the organization you want to create a group in.
-1. Select **Manage** > **Groups and projects**.
-1. Select **New group**.
-1. In the **Group name** text box, enter the name of the group. For a list of words that cannot be used as group names, see
-   [reserved names](../reserved_names.md).
-1. In the **Group URL** text box, enter the path for the group used for the [namespace](../namespace/_index.md).
-1. Select the [**Visibility level**](../public_access.md) of the group.
-1. Select **Create group**.
-
-## View users
-
-1. On the left sidebar, select **Organizations** and find the organization you want to view.
-1. Select **Manage** > **Users**.
-
-## Change a user's role
-
-Prerequisites:
-
-- You must have the Owner role for the organization.
-
-To change a user's role:
-
-1. On the left sidebar, select **Organizations** and find the organization you want to manage.
-1. Select **Manage** > **Users**.
-1. Find the user whose role you want to update.
-1. From the **Organization role** dropdown list, select a role.
-
-{{< alert type="note" >}}
-
-If you cannot select from the **Organization role** dropdown list, this user is the organization's only Owner. To change this user's role, first assign the Owner role to another user.
-
-{{< /alert >}}
-
 ## Supported Markdown for Organization description
 
 The Organization description field supports a limited subset of [GitLab Flavored Markdown](../markdown.md), including:
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index f1e885228cfe13..f1978139f5258e 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -46116,9 +46116,6 @@ msgstr ""
 msgid "Organization|Internal - The organization can be accessed by any signed in user except external users."
 msgstr ""
 
-msgid "Organization|Learn more about visibility levels"
-msgstr ""
-
 msgid "Organization|Manage"
 msgstr ""
 
@@ -46261,9 +46258,6 @@ msgstr ""
 msgid "Organization|View all"
 msgstr ""
 
-msgid "Organization|Who can see this organization?"
-msgstr ""
-
 msgid "Organization|You can now start using your new organization."
 msgstr ""
 
diff --git a/spec/frontend/organizations/settings/general/components/visibility_level_spec.js b/spec/frontend/organizations/settings/general/components/visibility_level_spec.js
index afc06c7d4ec58a..75524715b19032 100644
--- a/spec/frontend/organizations/settings/general/components/visibility_level_spec.js
+++ b/spec/frontend/organizations/settings/general/components/visibility_level_spec.js
@@ -6,7 +6,6 @@ import {
   VISIBILITY_LEVEL_PRIVATE_INTEGER,
   ORGANIZATION_VISIBILITY_LEVEL_DESCRIPTIONS,
 } from '~/visibility_level/constants';
-import HelpPageLink from '~/vue_shared/components/help_page_link/help_page_link.vue';
 
 describe('VisibilityLevel', () => {
   let wrapper;
@@ -41,7 +40,6 @@ describe('VisibilityLevel', () => {
 
   const findSettingsBlock = () => wrapper.findComponent(SettingsBlock);
   const findVisibilityLevelRadioButtons = () => wrapper.findComponent(VisibilityLevelRadioButtons);
-  const findHelpPageLink = () => wrapper.findComponent(HelpPageLink);
 
   beforeEach(() => {
     createComponent();
@@ -69,13 +67,4 @@ describe('VisibilityLevel', () => {
       visibilityLevelDescriptions: ORGANIZATION_VISIBILITY_LEVEL_DESCRIPTIONS,
     });
   });
-
-  it('renders label description with link to docs', () => {
-    expect(wrapper.text()).toContain('Who can see this organization?');
-    expect(findHelpPageLink().props()).toEqual({
-      href: 'user/organization/_index',
-      anchor: 'view-an-organizations-visibility-level',
-    });
-    expect(findHelpPageLink().text()).toBe('Learn more about visibility levels');
-  });
 });
diff --git a/spec/frontend/organizations/shared/components/new_edit_form_spec.js b/spec/frontend/organizations/shared/components/new_edit_form_spec.js
index 6772f0708d479e..4a7a71f8a6ecaa 100644
--- a/spec/frontend/organizations/shared/components/new_edit_form_spec.js
+++ b/spec/frontend/organizations/shared/components/new_edit_form_spec.js
@@ -13,7 +13,6 @@ import {
   FORM_FIELD_AVATAR,
 } from '~/organizations/shared/constants';
 import VisibilityLevelRadioButtons from '~/visibility_level/components/visibility_level_radio_buttons.vue';
-import HelpPageLink from '~/vue_shared/components/help_page_link/help_page_link.vue';
 import {
   ORGANIZATION_VISIBILITY_LEVEL_DESCRIPTIONS,
   VISIBILITY_LEVEL_PRIVATE_INTEGER,
@@ -52,7 +51,6 @@ describe('NewEditForm', () => {
     wrapper.findByTestId('description-character-counter');
   const findAvatarField = () => wrapper.findComponent(AvatarUploadDropzone);
   const findVisibilityLevelRadioButtons = () => wrapper.findComponent(VisibilityLevelRadioButtons);
-  const findHelpPageLink = () => wrapper.findComponent(HelpPageLink);
 
   const setUrlFieldValue = async (value) => {
     findUrlField().vm.$emit('input', value);
@@ -184,12 +182,6 @@ describe('NewEditForm', () => {
       visibilityLevels: [VISIBILITY_LEVEL_PRIVATE_INTEGER],
       visibilityLevelDescriptions: ORGANIZATION_VISIBILITY_LEVEL_DESCRIPTIONS,
     });
-    expect(wrapper.text()).toContain('Who can see this organization?');
-    expect(findHelpPageLink().props()).toEqual({
-      href: 'user/organization/_index',
-      anchor: 'view-an-organizations-visibility-level',
-    });
-    expect(findHelpPageLink().text()).toBe('Learn more about visibility levels');
   });
 
   describe('when `fieldsToRender` prop is set', () => {
-- 
GitLab