diff --git a/claude.md b/claude.md index d993cadba2..064ac757c3 100644 --- a/claude.md +++ b/claude.md @@ -72,7 +72,7 @@ Replace problematic terms with inclusive alternatives: ### Text Styling - **Use bold** for GUI menu options and button text: - - Select **Organization Settings** from the sidebar + - Select **Org** from the sidebar - Click **Set Up Project** - **Use italics** for commonly understood technical concepts (not CircleCI features): - _Continuous Integration_ diff --git a/docs/contributors/modules/docs-style/pages/formatting.adoc b/docs/contributors/modules/docs-style/pages/formatting.adoc index 012abc6c40..6eed60f6a1 100644 --- a/docs/contributors/modules/docs-style/pages/formatting.adoc +++ b/docs/contributors/modules/docs-style/pages/formatting.adoc @@ -8,7 +8,7 @@ pass:[] == Styling text * Use **bold** for GUI menu options and button text. For example: -** Select **Organization Settings** from the sidebar +** Select **Org** from the sidebar ** Select **VCS** in the **Project Settings** window ** Select **Projects** from the sidebar and click **Set Up Project** for the project you want to follow diff --git a/docs/guides/modules/ROOT/partials/create-project/steps-up-to-pipeline.adoc b/docs/guides/modules/ROOT/partials/create-project/steps-up-to-pipeline.adoc index 38e3db6d37..7835878e33 100644 --- a/docs/guides/modules/ROOT/partials/create-project/steps-up-to-pipeline.adoc +++ b/docs/guides/modules/ROOT/partials/create-project/steps-up-to-pipeline.adoc @@ -1,4 +1,4 @@ -. In the link:https://app.circleci.com/home[CircleCI web app], select **Organization Home** in the sidebar. +. In the link:https://app.circleci.com/home[CircleCI web app], select **Home** in the sidebar. . Select btn:[Create Project] at the top of the page, or anywhere in the btn:[Create a project] card if this is your first project. + .Create a project button diff --git a/docs/guides/modules/ROOT/partials/faq/cancel-subscription-faq-snip.adoc b/docs/guides/modules/ROOT/partials/faq/cancel-subscription-faq-snip.adoc index 7612d26561..e56938e5e4 100644 --- a/docs/guides/modules/ROOT/partials/faq/cancel-subscription-faq-snip.adoc +++ b/docs/guides/modules/ROOT/partials/faq/cancel-subscription-faq-snip.adoc @@ -16,7 +16,7 @@ For GitHub users, your account has the "Owner" role in your GitHub organization. For Bitbucket Cloud users, your account has "Admin" permissions in your Bitbucket repository. -For GitLab users, your account is listed as "Org Admin" in the CircleCI web app under menu:Organization Settings[People]. +For GitLab users, your account is listed as "Org Admin" in the CircleCI web app under menu:Org[People]. [#what-happens-upon-cancelling-a-performance-plan-subscription] === What happens upon cancelling a Performance Plan subscription? diff --git a/docs/guides/modules/ROOT/partials/orbs/orb-types.adoc b/docs/guides/modules/ROOT/partials/orbs/orb-types.adoc index 17b0cda663..7c0271988a 100644 --- a/docs/guides/modules/ROOT/partials/orbs/orb-types.adoc +++ b/docs/guides/modules/ROOT/partials/orbs/orb-types.adoc @@ -6,7 +6,7 @@ If you would like to author your own registry orb, read more on the xref:orbs:au *URL orbs*:: URL orbs are stored in a publicly accessible location (for example, a git repository or a public S3 object) and are not published to the orbs registry. + -URL orbs do not follow semantic versioning, and can be accessed directly using an `https` URL. An org-level allow list is used to manage the addresses of URL orbs that can be used in a project in that organization. Organization admins can manage the allow list at menu:Organization Settings[Orbs]. +URL orbs do not follow semantic versioning, and can be accessed directly using an `https` URL. An org-level allow list is used to manage the addresses of URL orbs that can be used in a project in that organization. Organization admins can manage the allow list at menu:Org[Orbs]. + See the xref:orbs:use:managing-url-orbs-allow-lists.adoc[Managing URL Orb Allow Lists] guide for more information on scoping allowed URL orbs for your organization. + diff --git a/docs/guides/modules/ROOT/partials/runner/install-with-cli-steps.adoc b/docs/guides/modules/ROOT/partials/runner/install-with-cli-steps.adoc index 6d257b3b2a..ec0c19597d 100644 --- a/docs/guides/modules/ROOT/partials/runner/install-with-cli-steps.adoc +++ b/docs/guides/modules/ROOT/partials/runner/install-with-cli-steps.adoc @@ -9,7 +9,7 @@ In order to install self-hosted runners, you will need to create a namespace and NOTE: To create resource classes and tokens you need to be an organization administrator in the VCS provider. -You can view your installed runners on the inventory page in the https://app.circleci.com/[web app] or your CircleCI server app, by clicking *Self-Hosted Runners* on the left navigation. +You can view your installed runners on the inventory page in the link:https://app.circleci.com/[web app] or your CircleCI server app, by selecting *Runners* from the sidebar. . Create a namespace for your organization's self-hosted runners. *Each organization can only create a single namespace*. We suggest using a lowercase representation of your CircleCI organization's account name. If you already use orbs, this namespace should be the same namespace orbs use. + diff --git a/docs/guides/modules/ROOT/partials/runner/install-with-web-app-steps.adoc b/docs/guides/modules/ROOT/partials/runner/install-with-web-app-steps.adoc index 432fa5235c..a9141244b5 100644 --- a/docs/guides/modules/ROOT/partials/runner/install-with-web-app-steps.adoc +++ b/docs/guides/modules/ROOT/partials/runner/install-with-web-app-steps.adoc @@ -1,9 +1,9 @@ //== CircleCI web app installation: pre-steps In order to install self-hosted runners, you will need to create a namespace and resource class token. To create resource classes and tokens, you need to be an organization admin in the VCS provider. You can read about namespaces and resource classes on the <> page. -You can view your installed runners on the inventory page, by clicking *Self-Hosted Runners* on the left navigation. +You can view your installed runners on the inventory page, by selecting *Runners* from the sidebar. -. On the https://app.circleci.com/[CircleCI web app], navigate to *Self-Hosted Runners* and select btn:[Create Resource Class]. +. On the https://app.circleci.com/[CircleCI web app], navigate to *Runners* and select btn:[Create Resource Class]. + image::guides:ROOT:runner/runner-ui-step-one.png[Runner set up, step one - Get started] diff --git a/docs/guides/modules/ROOT/partials/runner/terms.adoc b/docs/guides/modules/ROOT/partials/runner/terms.adoc index 6d28fdb5f0..788af63bdb 100644 --- a/docs/guides/modules/ROOT/partials/runner/terms.adoc +++ b/docs/guides/modules/ROOT/partials/runner/terms.adoc @@ -7,18 +7,18 @@ Web app installation:: + -- -Before you can install self-hosted runners through the web app, you will need to agree to the https://circleci.com/legal/runner-terms/[CircleCI Runner Terms]. To access the *Self-Hosted Runners* section of the https://app.circleci.com/[CircleCI web app] an organization admin must agree to the terms at menu:Organization Settings[Self-Hosted Runners]. +Before you can install self-hosted runners through the web app, you will need to agree to the https://circleci.com/legal/runner-terms/[CircleCI Runner Terms]. To access the *Runners* section of the https://app.circleci.com/[CircleCI web app] an organization admin must agree to the terms at menu:Org[Runners]. .Runner terms and conditions image::guides:ROOT:runnerui_terms.png[Runner terms and conditions] -Once the terms have been accepted, **Self-Hosted Runners** will appear permanently in the side navigation. +Once the terms have been accepted, **Runners** will appear permanently in the side navigation. Your role within your org is determined differently depending on how you integrate with your code, as follows: * If you have a `github` or `bitbucket` type organization, CircleCI mirrors VCS permissions for organizations. If you are an admin on your organization's VCS, you are an admin on CircleCI. If you are unsure, https://support.circleci.com/hc/en-us/articles/360034990033-Am-I-an-Org-Admin[check the admin permissions] on your VCS. -* If you have a `circleci` type organization, you can check roles by navigating to menu:Organization Settings[People]. Full details on roles and permissions are available in the xref:guides:permissions-authentication:roles-and-permissions-overview.adoc[Roles and Permissions Overview]. +* If you have a `circleci` type organization, you can check roles by navigating to menu:Org[People]. Full details on roles and permissions are available in the xref:guides:permissions-authentication:roles-and-permissions-overview.adoc[Roles and Permissions Overview]. TIP: Find out about organization types in the xref:guides:permissions-authentication:users-organizations-and-integrations-guide.adoc[Users, Organizations and Integrations Guide]. -- diff --git a/docs/guides/modules/about-circleci/pages/introduction-to-the-circleci-web-app.adoc b/docs/guides/modules/about-circleci/pages/introduction-to-the-circleci-web-app.adoc index da9e5480df..68cf5ab2f8 100644 --- a/docs/guides/modules/about-circleci/pages/introduction-to-the-circleci-web-app.adoc +++ b/docs/guides/modules/about-circleci/pages/introduction-to-the-circleci-web-app.adoc @@ -92,7 +92,7 @@ image::guides:ROOT:user_settings.png[User settings] == Organization homepage and navigation -After selecting an organization you will find yourself on the Organization homepage, or Dashboard if you are using CircleCI Server. The organization homepage provides an overview of your org's projects, project health metrics, and compute and credit usage metrics for your org. +After selecting an organization you will find yourself on the organization homepage (called **Home** in the sidebar), or Dashboard if you are using CircleCI Server. The organization homepage provides an overview of your org's projects, project health metrics, and compute and credit usage metrics for your org. .Organization Homepage image::guides:ROOT:org-homepage.png[Organization homepage] @@ -109,9 +109,9 @@ From your organization home page you have access to org-level options. You can c **Insights**: Provides you with time-series data overviews of credit usage, success rates, pipeline duration, and more. For full details of the Insights feature, see the xref:insights:insights.adoc[Using Insights] page. -**Self-Hosted Runners**: Set up self-hosted runners to use your own infrastructure for running jobs. Once set up the self-hosted runners dashboard displays a list of your resource classes and self-hosted runners. For full details covering installation, setup, and usage, see the xref:execution-runner:runner-overview.adoc[Self-Hosted Runners Overview] page. +**Runners**: Set up self-hosted runners to use your own infrastructure for running jobs. Once set up the self-hosted runners dashboard displays a list of your resource classes and self-hosted runners. For full details covering installation, setup, and usage, see the xref:execution-runner:runner-overview.adoc[Self-Hosted Runners Overview] page. -**Organization Settings**: Settings for your organization including org roles and groups, contexts, security, orbs and more. You can find your organization ID and organization slug on this page. +**Org**: Settings for your organization including org roles and groups, contexts, security, orbs and more. You can find your organization ID and organization slug on this page. **Plan**: Displays your network and storage usage, as well as additional settings related to your plan. @@ -285,7 +285,7 @@ Learn more and get started with self-hosted runners on the xref:execution-runner [#organization-settings] == Organization settings -The following organization settings are available by selection "Organization Settings" in the sidebar: +The following organization settings are available by selecting *Org* from the sidebar: [.table-scroll] -- diff --git a/docs/guides/modules/config-policies/pages/config-policies-for-self-hosted-runner.adoc b/docs/guides/modules/config-policies/pages/config-policies-for-self-hosted-runner.adoc index 81aabf3af4..7840cb1d80 100644 --- a/docs/guides/modules/config-policies/pages/config-policies-for-self-hosted-runner.adoc +++ b/docs/guides/modules/config-policies/pages/config-policies-for-self-hosted-runner.adoc @@ -73,7 +73,7 @@ In the following steps you will replace `namespace/resource_class` and `project_ == 2. Update policy with your details . Replace `namespace/resource_class` with one of your runner resource classes: -.. In the CircleCI web app, go to your self-hosted runner's inventory page by selecting **Self-Hosted Runners** in the sidebar. If you do not see this option, check that you have accepted the CircleCI Runner Terms and created a namespace and resource class, as outlined in the runner installation guides. Here you will see all your available self-hosted runner resource classes. +.. In the CircleCI web app, go to your self-hosted runner's inventory page by selecting **Runners** in the sidebar. If you do not see this option, check that you have accepted the CircleCI Runner Terms and created a namespace and resource class, as outlined in the runner installation guides. Here you will see all your available self-hosted runner resource classes. .. Replace `namespace/resource_class` in the `runner.rego` file with the name of the resource class that you would like to restrict. . Replace `project_UUIDs` with a project ID: diff --git a/docs/guides/modules/execution-managed/pages/resource-class-lifecycle.adoc b/docs/guides/modules/execution-managed/pages/resource-class-lifecycle.adoc index f962e578eb..6404db0f0d 100644 --- a/docs/guides/modules/execution-managed/pages/resource-class-lifecycle.adoc +++ b/docs/guides/modules/execution-managed/pages/resource-class-lifecycle.adoc @@ -64,7 +64,7 @@ machine: If you need immediate relief to restore workflows during an active brownout, you can temporarily disable brownouts. -Navigate to *Organization Settings > Advanced > Enable resource class brownouts* and toggle the setting off. +Navigate to menu:Org[Advanced > Enable resource class brownouts] and toggle the setting off. [IMPORTANT] ==== diff --git a/docs/guides/modules/getting-started/pages/create-project.adoc b/docs/guides/modules/getting-started/pages/create-project.adoc index 56278ebdc0..9d5fde1fac 100644 --- a/docs/guides/modules/getting-started/pages/create-project.adoc +++ b/docs/guides/modules/getting-started/pages/create-project.adoc @@ -15,12 +15,12 @@ This guide gets you started with creating a new project in CircleCI. The authorization method used to set up your CircleCI account determines the definition of "project" in CircleCI, as well as the permissions management processes available to you: -On the **Organization Home** page, check which option you see: +On the **Home** page, check which option you see: * If you see a btn:[Set up a project] button, follow steps to <> below. * If you see a btn:[Create Project] button, follow steps to <> below. -NOTE: Using CircleCI Server? Use the <> steps below. Rather than Organization Home you will see Dashboard in the web app sidebar. +NOTE: Using CircleCI Server? Use the <> steps below. Rather than Home you will see Dashboard in the web app sidebar. [#create-a-project] === Create a project @@ -189,7 +189,7 @@ NOTE: If you authenticated CircleCI with either the xref:integration:github-inte Follow these steps to set up a new project in CircleCI: -. In the CircleCI web app, select **Organization Home** in the sidebar. The equivalent option in CircleCI Server is **Dashboard**. +. In the CircleCI web app, select **Home** in the sidebar. The equivalent option in CircleCI Server is **Dashboard**. . Select btn:[Set up a project]. + .Set up a project diff --git a/docs/guides/modules/getting-started/pages/first-steps.adoc b/docs/guides/modules/getting-started/pages/first-steps.adoc index 3b8b88ab79..dbfcd44ca9 100644 --- a/docs/guides/modules/getting-started/pages/first-steps.adoc +++ b/docs/guides/modules/getting-started/pages/first-steps.adoc @@ -61,7 +61,7 @@ If you choose not to connect your code at this time, you can still explore some * Or some of our own sample projects: a link:https://app.circleci.com/pipelines/github/CircleCI-Public/sample-javascript-cfd/[sample JavaScript app], and a link:https://app.circleci.com/pipelines/github/CircleCI-Public/sample-python-cfd/[sample Python app]. **** -. Invite your team by navigating to menu:Organization Settings[People]. For more information on inviting people to your org, see the xref:invite-your-team.adoc#invite-teammates[Join your teammates] page. +. Invite your team by navigating to menu:Org[People]. For more information on inviting people to your org, see the xref:invite-your-team.adoc#invite-teammates[Join your teammates] page. [#sign-up-with-an-invite] == Sign up with an invite diff --git a/docs/guides/modules/getting-started/pages/getting-started.adoc b/docs/guides/modules/getting-started/pages/getting-started.adoc index 04de87f8aa..d1d4d12ee0 100644 --- a/docs/guides/modules/getting-started/pages/getting-started.adoc +++ b/docs/guides/modules/getting-started/pages/getting-started.adoc @@ -163,7 +163,7 @@ Expand any step to view the build output. You can search, share or download the image:guides:ROOT:getting-started-guide-exp/invite.png[float=right] [%hardbreaks] *Invite teammates* -Invite teammates to collaborate on your projects. Navigate to *Organization Settings > People* to generate invites and get further instructions. Collaborators can view and follow your projects. Teammates can make a free CircleCI account at any time to view your pipelines, even if they are not committing any code. +Invite teammates to collaborate on your projects. Navigate to menu:Org[People] to generate invites and get further instructions. Collaborators can view and follow your projects. Teammates can make a free CircleCI account at any time to view your pipelines, even if they are not committing any code. == 3. Debug and iterate diff --git a/docs/guides/modules/getting-started/pages/invite-your-team.adoc b/docs/guides/modules/getting-started/pages/invite-your-team.adoc index 54750bcc89..4008c1e822 100644 --- a/docs/guides/modules/getting-started/pages/invite-your-team.adoc +++ b/docs/guides/modules/getting-started/pages/invite-your-team.adoc @@ -63,11 +63,11 @@ include::ROOT:partial$tips/check-org-type.adoc[] + -- . In the CircleCI web app, select your org from the org cards on your user homepage. -. Navigate to menu:Organization Settings[People], then select btn:[Invite]. +. Navigate to menu:Org[People], then select btn:[Invite]. . To send out email invites, enter your team members' email addresses. Multiple emails can be separated by a space. Then, assign their role in your CircleCI organization. If you need to assign different roles to different team members, add team members in the Invite form based on role. . Once they join your org, you can then also assign each team member a role on an individual project level. See the xref:permissions-authentication:manage-roles-and-permissions.adoc[Manage roles and permissions] page for more details. -image::guides:ROOT:invite-teammates-standalone.png[Navigate to Organization Settings, People, use the Invite form] +image::guides:ROOT:invite-teammates-standalone.png[Navigate to Org, People, use the Invite form] -- `github` or `bitbucket` type organization:: + @@ -77,7 +77,7 @@ image::guides:ROOT:invite-teammates-standalone.png[Navigate to Organization Sett . Select btn:[Copy Invite Link] -- an invite message is now copied to your clipboard. . Past the invite message to your teammates via email or whatever method you prefer. -image::guides:ROOT:invite-teammates-classic.png[Navigate to Organization Settings, People, use the Copy Invite Link button] +image::guides:ROOT:invite-teammates-classic.png[Navigate to Org, People, use the Copy Invite Link button] -- ==== diff --git a/docs/guides/modules/getting-started/pages/slack-orb-tutorial.adoc b/docs/guides/modules/getting-started/pages/slack-orb-tutorial.adoc index eeb7d70e68..28784b37d1 100644 --- a/docs/guides/modules/getting-started/pages/slack-orb-tutorial.adoc +++ b/docs/guides/modules/getting-started/pages/slack-orb-tutorial.adoc @@ -153,9 +153,9 @@ In CircleCI, contexts allow you to secure and share environment variables across In CircleCI: -. Select the **Organization Settings** page. +. Select the **Org** page. + -image::guides:ROOT:slack-orb-organization-settings.png[Organization Settings] +image::guides:ROOT:slack-orb-organization-settings.png[Org] . Under Context, select the blue *Create Context* button and add a unique name, such as `slack-secrets` (that is the name specified in the `config.yml` file above). + diff --git a/docs/guides/modules/integration/pages/enable-checks.adoc b/docs/guides/modules/integration/pages/enable-checks.adoc index 8869dc5d5f..c6b9e00825 100644 --- a/docs/guides/modules/integration/pages/enable-checks.adoc +++ b/docs/guides/modules/integration/pages/enable-checks.adoc @@ -47,7 +47,7 @@ the status of the skipped builds will not be reported. The checks are still crea [#enable-github-checks] == Enable GitHub Checks -. In the CircleCI app sidebar, select *Organization Settings*. +. In the CircleCI app sidebar, select *Org*. . Select *VCS Connections*. . Select *Manage GitHub Checks*. + @@ -68,9 +68,9 @@ NOTE: Your project will continue receiving job level status after GitHub Checks [#disable-github-checks-for-a-project] == Disable GitHub Checks for a project -To disable the GitHub Checks integration, navigate to the *Organization Settings* page in the CircleCI app, then remove the repositories using GitHub Checks, as follows: +To disable the GitHub Checks integration, navigate to the *Org* page in the CircleCI app, then remove the repositories using GitHub Checks, as follows: -. Select *Organization Settings* in the CircleCI sidebar. +. Select *Org* in the CircleCI sidebar. . Select *VCS Connections*. . Select *Manage GitHub Checks*. The Update CircleCI Checks repository access page appears. + @@ -83,7 +83,7 @@ image::guides:ROOT:github-status-updates.png[CircleCI VCS Settings Page] [#uninstall-checks-for-the-organization] == Uninstall Checks for the organization -. Select *Organization Settings* in the CircleCI sidebar. +. Select *Org* in the CircleCI sidebar. . Select *VCS Connections*. . Select *Manage GitHub Checks*. + diff --git a/docs/guides/modules/integration/pages/jira-plugin.adoc b/docs/guides/modules/integration/pages/jira-plugin.adoc index ac52741412..c48dbdebea 100644 --- a/docs/guides/modules/integration/pages/jira-plugin.adoc +++ b/docs/guides/modules/integration/pages/jira-plugin.adoc @@ -47,7 +47,7 @@ image::guides:ROOT:jira_expand_app_details.png[Expand App Details] + [NOTE] ==== -Your CircleCI organization ID is only needed for the initial setup. You can find it by navigating to menu:Organization Settings[Overview] in the link:https://app.circleci.com/[CircleCI web app]. +Your CircleCI organization ID is only needed for the initial setup. You can find it by navigating to menu:Org[Overview] in the link:https://app.circleci.com/[CircleCI web app]. This integration authenticates via xref:permissions-authentication:openid-connect-tokens.adoc[OpenID Connect] (OIDC). By default, the organization ID provided is used for audience validation, but this can be modified, or more can be added. ==== diff --git a/docs/guides/modules/integration/pages/using-the-circleci-github-app-in-an-oauth-org.adoc b/docs/guides/modules/integration/pages/using-the-circleci-github-app-in-an-oauth-org.adoc index 6599d56cf6..7a629533f5 100644 --- a/docs/guides/modules/integration/pages/using-the-circleci-github-app-in-an-oauth-org.adoc +++ b/docs/guides/modules/integration/pages/using-the-circleci-github-app-in-an-oauth-org.adoc @@ -167,7 +167,7 @@ Organizations with `/github/` in their URL can leverage both GitHub integration Installing the CircleCI GitHub App is a one-time action that enables all new features across the entire organization. Only organization admins can take this action. -. Navigate to menu:Organization Settings[VCS Connections]. +. Navigate to menu:Org[VCS Connections]. . Select btn:[Install GitHub App]. . Select repositories to grant access. . Create new GitHub App pipelines alongside existing OAuth pipelines. This can be achieved in the following ways: @@ -217,7 +217,7 @@ Instead, if you want to stop building through the OAuth integration, duplicate t === Why can't I see GitHub App options? -Ensure the GitHub App is installed via menu:Organization Settings[VCS Connections]. Then select btn:[Add pipeline] on the menu:Project Settings[Project setup] page to create a new GitHub App pipeline. +Ensure the GitHub App is installed via menu:Org[VCS Connections]. Then select btn:[Add pipeline] on the menu:Project Settings[Project setup] page to create a new GitHub App pipeline. === How do I prevent duplicate builds? diff --git a/docs/guides/modules/orchestrate/pages/pipelines.adoc b/docs/guides/modules/orchestrate/pages/pipelines.adoc index 82046670c2..fbffe8ab38 100644 --- a/docs/guides/modules/orchestrate/pages/pipelines.adoc +++ b/docs/guides/modules/orchestrate/pages/pipelines.adoc @@ -102,7 +102,7 @@ To add or edit a pipeline, follow these steps: + NOTE: If you integrate with xref:integration:github-integration.adoc[CircleCI's GitHub OAuth App] you can select GitHub App here to install the App into your org and access xref:integration:using-the-circleci-github-app-in-an-oauth-org.adoc[improved security and new features]. This is a one-time step, which can be done by an organization admin or a user who has admin access to at least one repository in the organization. Once installed, further GitHub App pipelines can be setup without this installation step. + -NOTE: For GitLab self-managed, you can input any instance that you have previously set up in CircleCI. If you wish to set a different feature branch or repository from a self-managed instance as a new pipeline, you will first need to add a new connection via your xref:permissions-authentication:users-organizations-and-integrations-guide.adoc#organization-integration[menu:Organization Settings[Integrations]]. In either case, you will also need to enter your personal access token again to authorize this connection. +NOTE: For GitLab self-managed, you can input any instance that you have previously set up in CircleCI. If you wish to set a different feature branch or repository from a self-managed instance as a new pipeline, you will first need to add a new connection via your xref:permissions-authentication:users-organizations-and-integrations-guide.adoc#organization-integration[menu:Org[VCS Connections]]. In either case, you will also need to enter your personal access token again to authorize this connection. ** Authorize your connection if this is not already showing with a check mark image:guides:ROOT:icons/passed.svg[passed icon, role="no-border"]. ** Define where the config file for this pipeline is stored: *** Select a repository from the dropdown. diff --git a/docs/guides/modules/orchestrate/pages/skip-build.adoc b/docs/guides/modules/orchestrate/pages/skip-build.adoc index 3f6a4f8832..577413d090 100644 --- a/docs/guides/modules/orchestrate/pages/skip-build.adoc +++ b/docs/guides/modules/orchestrate/pages/skip-build.adoc @@ -107,7 +107,7 @@ NOTE: For server customers, this feature will be available in Server 4.10+. Use this setting to immediately stop all new work from starting during an incident or emergency. When enabled, new pipelines are not created and users cannot rerun workflows. -This setting is designed for situations where you need to quickly halt all CI/CD activity across an organization or for a specific project. It is available in the **Advanced** section of both **Organization Settings** and **Project Settings**. An organization-level block prevents all new work across every project in the organization. A project-level block only affects the specific project. +This setting is designed for situations where you need to quickly halt all CI/CD activity across an organization or for a specific project. It is available in the **Advanced** section of both **Org** and **Project Settings**. An organization-level block prevents all new work across every project in the organization. A project-level block only affects the specific project. **In-progress workflows are not affected.** Workflows that are already running when you enable this setting continue until they complete, fail, or are cancelled. diff --git a/docs/guides/modules/permissions-authentication/pages/manage-groups.adoc b/docs/guides/modules/permissions-authentication/pages/manage-groups.adoc index c55e156671..c49d153cab 100644 --- a/docs/guides/modules/permissions-authentication/pages/manage-groups.adoc +++ b/docs/guides/modules/permissions-authentication/pages/manage-groups.adoc @@ -22,7 +22,7 @@ The how-to guides on this page provide steps for some common group management ta NOTE: To do this, you must have the _Organization Admin_ role. -. In the CircleCI web app, click on **Organization Settings** in the sidebar +. In the CircleCI web app, click on **Org** in the sidebar . Select **Groups** from the sidebar . Click btn:[Create Group] . Enter a name and description (optional) for your group @@ -35,7 +35,7 @@ View your new group in the groups list. Click on the group name to view details. NOTE: To do this, you must have the _Organization Admin_ role. -. In the CircleCI web app, click on **Organization Settings** in the sidebar +. In the CircleCI web app, click on **Org** in the sidebar . Select **Groups** from the sidebar . Click on the name of the group you want to add people to . On the group page, click btn:[Add members] @@ -68,7 +68,7 @@ NOTE: To do this, you must have the _Organization Admin_ role. NOTE: To do this, you must have the _Organization Admin_ role. -. In the CircleCI web app, click on **Organization Settings** in the sidebar +. In the CircleCI web app, click on **Org** in the sidebar . Select **Groups** from the sidebar . Click on the name of the group in the list to view the group details page . Click btn:[Delete group] @@ -78,7 +78,7 @@ NOTE: To do this, you must have the _Organization Admin_ role. NOTE: To do this, you must have the _Organization Admin_ role. -. In the CircleCI web app, click on **Organization Settings** in the sidebar +. In the CircleCI web app, click on **Org** in the sidebar . Select **Groups** from the sidebar . Click on the name of the group in the list . Click on the checkbox next to the user you want to remove from the group, and click btn:[Remove Members] diff --git a/docs/guides/modules/permissions-authentication/pages/manage-roles-and-permissions.adoc b/docs/guides/modules/permissions-authentication/pages/manage-roles-and-permissions.adoc index c234387dc1..a38a7c458f 100644 --- a/docs/guides/modules/permissions-authentication/pages/manage-roles-and-permissions.adoc +++ b/docs/guides/modules/permissions-authentication/pages/manage-roles-and-permissions.adoc @@ -20,7 +20,7 @@ Manage user access to organizations and projects with CircleCI roles and associa NOTE: To do this, you must have the _Organization Admin_ role. -. In the CircleCI web app, select **Organization Settings** in the sidebar. +. In the CircleCI web app, select **Org** in the sidebar. . Select **People**. + TIP: If you have integrated your code with CircleCI using either xref:integration:github-integration.adoc[GitHub OAuth] or xref:integration:bitbucket-integration.adoc[Bitbucket Cloud] these steps do not apply. You can use the btn:[Copy Invite Link] button to copy the necessary information to email your teammates. @@ -38,7 +38,7 @@ If they do not have a CircleCI account, they will need to sign up. If they alrea NOTE: To do this, you must have the _Organization Admin_ role. -. In the CircleCI web app, select **Organization Settings** in the sidebar. +. In the CircleCI web app, select **Org** in the sidebar. . Select **People**. . Scroll to locate the person you want to update permissions for. . Use the dropdown menu next to their name to select a new role. @@ -50,7 +50,7 @@ NOTE: You must have at least one org administrator. If you try to remove the las NOTE: To do this, you must have the _Organization Admin_ role. -. In the CircleCI web app, select **Organization Settings** in the sidebar. +. In the CircleCI web app, select **Org** in the sidebar. . Select **People**. . Scroll to locate the person you want to remove. . Select the ellipsis (...) button next to their name and select btn:[Remove from organization]. diff --git a/docs/guides/modules/permissions-authentication/pages/openid-connect-tokens.adoc b/docs/guides/modules/permissions-authentication/pages/openid-connect-tokens.adoc index 55af1bf8c8..adeeca35b7 100644 --- a/docs/guides/modules/permissions-authentication/pages/openid-connect-tokens.adoc +++ b/docs/guides/modules/permissions-authentication/pages/openid-connect-tokens.adoc @@ -242,7 +242,7 @@ The steps in this section are based on Google Cloud Platform's link:https://clou To create your identity provider you will need to know your link:https://openid.net/specs/openid-connect-core-1_0.html#Terminology[OpenID Provider], which is unique to your organization. The OpenID Provider URL is `\https://oidc.circleci.com/org/`, where `organization_id` is your unique organization identifier. -TIP: You can find your CircleCI organization ID by navigating to **Organization Settings > Overview** in the https://app.circleci.com/[CircleCI web app]. +TIP: You can find your CircleCI organization ID by navigating to menu:Org[Overview] in the link:https://app.circleci.com/[CircleCI web app]. The default OpenID Connect ID tokens issued by CircleCI have a fixed audience (see `aud` in <>), which is also the organization ID. To generate tokens with _custom_ audience claims, see the xref:oidc-tokens-with-custom-claims.adoc[OIDC Tokens With Custom Claims] page. diff --git a/docs/guides/modules/permissions-authentication/pages/set-up-sso.adoc b/docs/guides/modules/permissions-authentication/pages/set-up-sso.adoc index 57d6fcfba8..a761f4f7a7 100644 --- a/docs/guides/modules/permissions-authentication/pages/set-up-sso.adoc +++ b/docs/guides/modules/permissions-authentication/pages/set-up-sso.adoc @@ -15,7 +15,7 @@ To set up SAML SSO, you must have the _Organization Admin_ role. For information To begin setting up a SAML SSO connection in your CircleCI organization, follow these steps: . In the link:https://app.circleci.com/home/[CircleCI web app], select your organization. -. Select **Organization Settings** in the sidebar. +. Select **Org** in the sidebar. . Select **Single Sign-On (SSO)** from the sidebar. . On the SSO Settings page, select **Setup SSO**. . Copy the provided **Setup Parameters** and **Allowed iFrame Origin**. You will need these to configure your Identity Provider (IdP). @@ -36,7 +36,7 @@ Next you will configure your IdP. The steps to do this will vary depending on yo To complete setting up a SAML SSO connection in your CircleCI organization: . In the link:https://app.circleci.com/home/[CircleCI web app], select your organization. -. Select **Organization Settings** in the sidebar. +. Select **Org** in the sidebar. . Select **Single Sign-On (SSO)** from the sidebar. . Enter the information provided by your IdP in the previous section. For the domain/realm, enter the email domain that your users will use for CircleCI SSO. When ready, select **Save credentials**. . Copy the provided TXT record and add it to your DNS. Your SSO Connection will be marked as **Pending** until this has been done. Adding the TXT record to your DNS allows CircleCI to validate that you are the owner of the domain on-which SSO is being enabled. @@ -56,7 +56,7 @@ Your organization is now using SSO to grant and deny user access. You can manage SSO can be disabled for an organization. This will revert an organization to using email and password authentication. . In the link:https://app.circleci.com/home/[CircleCI web app], select your organization. -. Select **Organization Settings** in the sidebar. +. Select **Org** in the sidebar. . Select **Single Sign-On (SSO)** from the sidebar. . Toggle **Enforce SSO for all users** off to disable SSO enforcement. diff --git a/docs/guides/modules/permissions-authentication/pages/sso-group-mapping.adoc b/docs/guides/modules/permissions-authentication/pages/sso-group-mapping.adoc index 0589e1e7cb..28c4310b13 100644 --- a/docs/guides/modules/permissions-authentication/pages/sso-group-mapping.adoc +++ b/docs/guides/modules/permissions-authentication/pages/sso-group-mapping.adoc @@ -34,7 +34,7 @@ image::guides:ROOT:authentication/sso-group-mapping-okta-setup.png[Screenshot of === 2. Configure CircleCI . In the link:https://app.circleci.com/home/[CircleCI web app], select your organization. -. Select **Organization Settings** in the sidebar. +. Select **Org** in the sidebar. . Select **Single sign-on (SSO)** from the sidebar. . Go to the Group Mappings section and click btn:[Add mapping]. This will open a form in a dropdown. . Enter the name of your Okta group under "SAML group name" and select the corresponding CircleCI group you want to map it to. diff --git a/docs/guides/modules/permissions-authentication/pages/users-organizations-and-integrations-guide.adoc b/docs/guides/modules/permissions-authentication/pages/users-organizations-and-integrations-guide.adoc index a2d614f091..ee21cc0f03 100644 --- a/docs/guides/modules/permissions-authentication/pages/users-organizations-and-integrations-guide.adoc +++ b/docs/guides/modules/permissions-authentication/pages/users-organizations-and-integrations-guide.adoc @@ -174,8 +174,8 @@ The organization integration options available to you depend on your organizatio Integrations are set up as follows: -* GitHub OAuth and Bitbucket Cloud are set up when logging in to CircleCI with your GitHub or Bitbucket social login. No additional action is required, but the installation can be viewed at menu:Organization Settings[VCS Connections]. -* GitHub App, GitLab self-managed and Bitbucket Data Center are managed from menu:Organization Settings[VCS Connections]. However, when creating a project (if using a `circleci` organization) or creating a new pipeline from menu:Project Settings[Project setup] you will also be walked through the installation process. +* GitHub OAuth and Bitbucket Cloud are set up when logging in to CircleCI with your GitHub or Bitbucket social login. No additional action is required, but the installation can be viewed at menu:Org[VCS Connections]. +* GitHub App, GitLab self-managed and Bitbucket Data Center are managed from menu:Org[VCS Connections]. However, when creating a project (if using a `circleci` organization) or creating a new pipeline from menu:Project Settings[Project setup] you will also be walked through the installation process. * GitLab SaaS installation is set up when creating a new project (menu:Projects[Create project]) or a new pipeline (menu:Project Settings[Pipelines]). If you are using a self-hosted GitLab instance or Bitbucket Data Center instance, some additional configuration is required as follows. See he <> section for more information. @@ -210,7 +210,7 @@ GitHub App:: -- *Availability*: A GitHub App integration is available for `circleci` and `github` type organizations. The CircleCI GitHub App is installed into an organization. -*View*: To view a GitHub App integration, navigate to menu:Organization Settings[VCS Connections]. If you are in a `circleci` or `github` organization you will either see your active GitHub App integration or an option to install the GitHub App. +*View*: To view a GitHub App integration, navigate to menu:Org[VCS Connections]. If you are in a `circleci` or `github` organization you will either see your active GitHub App integration or an option to install the GitHub App. *Disconnect*: To *uninstall* the GitHub App from your organization, select the trash/bin button and follow the instructions. -- @@ -219,7 +219,7 @@ GitHub OAuth:: -- *Availability*: A GitHub OAuth app integration is installed into a `github` type organization. -*View*: To *view* a GitHub OAuth app integration, navigate to menu:Organization Settings[VCS Connections]. If the GitHub OAuth app is installed you will see this indicated in the OAuth app section. +*View*: To *view* a GitHub OAuth app integration, navigate to menu:Org[VCS Connections]. If the GitHub OAuth app is installed you will see this indicated in the OAuth app section. *Disconnect*: You can _disconnect_ your GitHub OAuth app integration. Doing so will remove your `github` organization from CircleCI. To disconnect your GitHub OAuth app integration, navigate to menu:User Settings[Account Integrations], select btn:[Disconnect] next to your GitHub integration and follow the instructions. -- @@ -228,7 +228,7 @@ Bitbucket:: -- *Availability*: A Bitbucket Cloud integration is installed into a `bitbucket` type organization. -*View*: To *view* a Bitbucket Cloud integration, navigate to menu:Organization Settings[VCS Connections]. If the Bitbucket Cloud integration is installed you will see this indicated in the Bitbucket Cloud section. +*View*: To *view* a Bitbucket Cloud integration, navigate to menu:Org[VCS Connections]. If the Bitbucket Cloud integration is installed you will see this indicated in the Bitbucket Cloud section. *Disconnect*: You can _disconnect_ your Bitbucket Cloud integration. Doing so will remove your `bitbucket` type organization from CircleCI. To disconnect your Bitbucket Cloud integration, navigate to menu:User Settings[Account Integrations], select btn:[Disconnect] next to your Bitbucket Cloud integration and follow the instructions. -- @@ -245,11 +245,11 @@ GitLab self-managed:: + -- -NOTE: If you are using both CircleCI's Bitbucket Data Center and GitLab self-managed integrations, there is a known bug in the menu:Organization Settings[Integrations] section of the CircleCI web app. Adding a `known_hosts` to one integration will populate the `known_hosts` for the other integration. To use both Bitbucket Data Center and GitLab self-managed integrations within the same CircleCI organization, add both respective `known_hosts` values to the one input field separated by a new line. +NOTE: If you are using both CircleCI's Bitbucket Data Center and GitLab self-managed integrations, there is a known bug in the menu:Org[VCS Connections] section of the CircleCI web app. Adding a `known_hosts` to one integration will populate the `known_hosts` for the other integration. To use both Bitbucket Data Center and GitLab self-managed integrations within the same CircleCI organization, add both respective `known_hosts` values to the one input field separated by a new line. *Availability*: A GitLab self-managed integration is installed into a `circleci` type organization. -*Configure*: Set up an integration with your GitLab self-managed instance from menu:Organization Settings[Integrations] as follows: +*Configure*: Set up an integration with your GitLab self-managed instance from menu:Org[VCS Connections] as follows: . Select btn:[Set Up Integration] next to GitLab self-managed. . Enter your GitLab self-managed instance URL, for example, `https://test-gitlab.circleci.com`. @@ -287,11 +287,11 @@ You cannot currently edit or delete existing GitLab self-managed integrations. Bitbucket Data Center:: + -- -NOTE: If you are using both CircleCI's Bitbucket Data Center and GitLab self-managed integrations, there is a known bug in the menu:Organization Settings[Integrations] section of the CircleCI web app. Adding a `known_hosts` to one integration will populate the `known_hosts` for the other integration. To use both Bitbucket Data Center and GitLab self-managed integrations within the same CircleCI organization, add both respective `known_hosts` values to the one input field separated by a new line. +NOTE: If you are using both CircleCI's Bitbucket Data Center and GitLab self-managed integrations, there is a known bug in the menu:Org[VCS Connections] section of the CircleCI web app. Adding a `known_hosts` to one integration will populate the `known_hosts` for the other integration. To use both Bitbucket Data Center and GitLab self-managed integrations within the same CircleCI organization, add both respective `known_hosts` values to the one input field separated by a new line. *Availability*: A Bitbucket Data Center integration is installed into a `circleci` type organization. -*Configure*: Set up an integration with your Bitbucket Data Center instance from menu:Organization Settings[Integrations] as follows: +*Configure*: Set up an integration with your Bitbucket Data Center instance from menu:Org[VCS Connections] as follows: . Select btn:[Set up integration] next to Bitbucket Data Center. . In the modal enter your Bitbucket Data Center instance URL and your `known_hosts`: @@ -314,7 +314,7 @@ The output will look something like the following: [bitbucket-datacenter.example.com]:1234 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAA//NF6iU86j0hfGxn8ncjgwvmk9tMKzhFqrRLaltP0TGt760PhfWk070raKLHS3L6H0BdN9qNVsTk63czziFDmtBehE82/XXX+59MuppY0DHG3brNvw4REPmzZkQNIR6Cs8b15iFbwnIL51IH9kBVMztWQaRDPkPPxihM6e0n/vo5n3uEIPCTZiwLgKRcpeks2LsfbsW0NN5Q7J1Irp/ACstfrsFWSntranbjMe6cIwELNY6FhvYmETzH0cY0= ---- + -Copy the full output from the `ssh-keyscan` command and enter it into the "known hosts" text box when setting up your integration in the CircleCI web app under menu:Organization Settings[Integrations]. +Copy the full output from the `ssh-keyscan` command and enter it into the "known hosts" text box when setting up your integration in the CircleCI web app under menu:Org[VCS Connections]. . Select btn:[Set Up Integration]. @@ -399,7 +399,7 @@ If you feel strongly about reducing the number of permissions CircleCI uses, con Enabling SAML protection on a GitHub org can cause changes to CircleCI’s settings related to GitHub Checks and GitHub status updates. Ensure these settings are configured for their desired state after enabling SAML for your organization. You can find these settings at: -* GitHub Checks, from the GitHub website, select menu:Organization Settings[VCS > GitHub Checks] +* GitHub Checks, from the GitHub website, select menu:Org[VCS > GitHub Checks] * GitHub status updates, from the CircleCI web app menu:Project Settings[Advanced > GitHub Status Updates] For more information on GitHub Checks and GitHub status updates, see the xref:integration:enable-checks.adoc#github-check-and-github-status-updates[Enabling GitHub Checks]. diff --git a/docs/guides/modules/security/pages/audit-logs.adoc b/docs/guides/modules/security/pages/audit-logs.adoc index 948b0f0711..8234f4ee47 100644 --- a/docs/guides/modules/security/pages/audit-logs.adoc +++ b/docs/guides/modules/security/pages/audit-logs.adoc @@ -11,7 +11,7 @@ All CircleCI organizations can request audit logs. You need to be an organizatio === How to request audit logs -. Navigate to menu:Organization Settings[Security]. +. Navigate to menu:Org[Security]. . Scroll down to the **Audit Logs** section. . Select the date range and then select btn:[Request audit logs]. @@ -125,7 +125,7 @@ The complete template for the trust relationship is the following: } ---- + -Replace `` with your 12-digit AWS account ID and `` with your unique CircleCI organization ID (found on the menu:Organization Settings[Overview] page in the link:https://app.circleci.com/[CircleCI web app]). +Replace `` with your 12-digit AWS account ID and `` with your unique CircleCI organization ID (found on the menu:Org[Overview] page in the link:https://app.circleci.com/[CircleCI web app]). .. Permissions policy + @@ -165,7 +165,7 @@ Replace `` with the name of your S3 bucket. ==== 2. Configure audit log streaming . Go to the link:https://app.circleci.com/[CircleCI web app]. -. Navigate to menu:Organization Settings[Security]. +. Navigate to menu:Org[Security]. . Scroll down to the menu:Audit Logs[Streaming audit logs] section and select btn:[Stream audit logs]. + image::guides:ROOT:stream-audit-logs.png[Stream audit logs section] diff --git a/docs/guides/modules/security/pages/contexts.adoc b/docs/guides/modules/security/pages/contexts.adoc index 43912edf70..2c667256fc 100644 --- a/docs/guides/modules/security/pages/contexts.adoc +++ b/docs/guides/modules/security/pages/contexts.adoc @@ -24,7 +24,7 @@ NOTE: Context names must be unique for each VCS organization. The default name f [#create-and-use-a-context] == Quickstart: Create and use a context -. Using the CircleCI web app, select menu:Organization Settings[Contexts] on the left side navigation. +. Using the CircleCI web app, select menu:Org[Contexts] on the left side navigation. + Be aware that organization members can create contexts, but only organization administrators can restrict them using security groups. The one exception to this case is Bitbucket organizations, which require a user to have the `create repositories` workspace permission, regardless of their other permissions on the workspace or the repositories it contains. + @@ -154,7 +154,7 @@ In this example, the jobs `test` and `deploy` are restricted, and `deploy` will If the context is restricted with a group other than `All members`, you must be a member of that security group to complete this task. To delete a context, follow the steps below: -. Navigate to the menu:Organization Settings[Contexts] in the CircleCI web app. +. Navigate to the menu:Org[Contexts] in the CircleCI web app. . Select the *X* icon in the row of the context you want to delete. A confirmation dialog box will appear. . Type "DELETE" in the field and then select *Delete Context*. The context and all associated environment variables will be deleted. @@ -165,19 +165,19 @@ NOTE: If a _deleted_ context is used in a job, the job will fail and show an err NOTE: Restricting the use of contexts using security groups is available for `github` type organizations only. For more information on organization types, see the xref:permissions-authentication:users-organizations-and-integrations-guide.adoc#organizations[Users, Organizations, and Integrations Guide]. -A context security setting is available for `github` type organizations to require all newly-created contexts in the organization to be group-restricted. Contexts can still be created, but an administrator must assign at least one security group before the context will be available for use in workflows. This setting can be found in menu:Organization Settings[Security]. +A context security setting is available for `github` type organizations to require all newly-created contexts in the organization to be group-restricted. Contexts can still be created, but an administrator must assign at least one security group before the context will be available for use in workflows. This setting can be found in menu:Org[Security]. [#restrict-a-context-to-a-security-group-or-groups] === Restrict a context to a security group or groups CAUTION: To use security group context restrictions you must be an organization administrator, and your code must be integrated with CircleCI via the GitHub OAuth app. -. Navigate to menu:Organization Settings[Contexts] in the CircleCI web app to see the list of contexts. The default security group is `All members`, and allows all users in the organization to invoke jobs with that context. +. Navigate to menu:Org[Contexts] in the CircleCI web app to see the list of contexts. The default security group is `All members`, and allows all users in the organization to invoke jobs with that context. . Select *Create Context* if you wish to use a new context, or select the name of an existing context (if using an existing context, you will need to remove the `All members` security group before adding a new one). . Select *Add Security Group* button to view the dialog box. . Make your choices in the dialog box and then select the *Add Security Group* or *Add Project Restriction* button to finalize. Contexts will now be restricted to the selections you have made. . Select *Add Environment Variables* to add environment variables to the context if none exist, fill out your desired name and value in the dialogue box, then select the *Add Environment Variables* button to finalize. Use of the environment variables for this context is now limited to members of the security groups. -. Navigate back to menu:Organization Settings[Contexts] in the CircleCI app. The security groups appear in the Security column for the context. +. Navigate back to menu:Org[Contexts] in the CircleCI app. The security groups appear in the Security column for the context. Only members of the selected groups may now use the context in their workflows or add or remove environment variables for the context. @@ -222,7 +222,7 @@ To invoke a workflow that uses a restricted context, the workflow must be part o You must be an *organization admin* to restrict a context though the method detailed below. -. Navigate to the menu:Organization Settings[Contexts] page of your organization in the https://app.circleci.com/[CircleCI web app]. The list of contexts will be visible. +. Navigate to the menu:Org[Contexts] page of your organization in the https://app.circleci.com/[CircleCI web app]. The list of contexts will be visible. . Select the name of an existing context, or select *Create Context* if you want to use a new context. . Select *Add Project Restriction* to view the dialog box. @@ -237,7 +237,7 @@ Only workflows under the specified projects may now use the context and its envi You must be an *organization admin* to remove projects from contexts though the method detailed below. -. Navigate to menu:Organization Settings[Contexts] page in the https://app.circleci.com/[CircleCI web app]. The list of contexts will be visible. +. Navigate to menu:Org[Contexts] page in the https://app.circleci.com/[CircleCI web app]. The list of contexts will be visible. . Select the name of the existing context for which you would like to modify restrictions. . Select *X* next to the project restriction you would like to remove. The project restriction will be removed for the context. . If there are no longer any project restrictions for the context, the context and its environment variables are now effectively unrestricted. @@ -261,7 +261,7 @@ and not job.ssh.enabled and not (pipeline.config_source starts-with "api") ---- -You can set up expression restrictions using the context restriction API, or via the Context page (menu:Organization Settings[Contexts>Expression Restrictions]) in the CircleCI web app. +You can set up expression restrictions using the context restriction API, or via the Context page (menu:Org[Contexts>Expression Restrictions]) in the CircleCI web app. Rules are expressed in a small language that supports equality checks, numeric comparisons, and boolean `and`, `or`, and `not` operators. @@ -288,7 +288,7 @@ API:: include::ROOT:partial$notes/server-api-examples.adoc[] . Set up your API authentication. Steps are available in the xref:toolkit:api-developers-guide.adoc#add-an-api-token[API Developers Guide]. -. You are going to need your organization ID. In the link:https://app.circleci.com/[CircleCI web app] select **Organization Settings** in the sidebar and copy your "Organization ID" somewhere safe. +. You are going to need your organization ID. In the link:https://app.circleci.com/[CircleCI web app] select **Org** in the sidebar and copy your "Organization ID" somewhere safe. . To get the ID for your context, list your contexts, as follows, substituting your organization ID: + [,shell] diff --git a/docs/guides/modules/security/pages/delete-organizations-and-projects.adoc b/docs/guides/modules/security/pages/delete-organizations-and-projects.adoc index cbd62d1767..80e6947240 100644 --- a/docs/guides/modules/security/pages/delete-organizations-and-projects.adoc +++ b/docs/guides/modules/security/pages/delete-organizations-and-projects.adoc @@ -62,7 +62,7 @@ CircleCI web app:: + -- . In the link:https://app.circleci.com[CircleCI web app], select your org from the org cards on your user homepage. -. Select **Organization Settings** in the sidebar. +. Select **Org** in the sidebar. . Scroll to the bottom of the Overview page and select btn:[Delete Organization]. . Confirm your choice by typing the organization name and selecting btn:[Permanently Delete Organization] in the popup. -- diff --git a/docs/guides/modules/security/pages/ip-ranges.adoc b/docs/guides/modules/security/pages/ip-ranges.adoc index a7bf5aa62d..ecabf66443 100644 --- a/docs/guides/modules/security/pages/ip-ranges.adoc +++ b/docs/guides/modules/security/pages/ip-ranges.adoc @@ -200,4 +200,4 @@ curl -O https://circleci.com/docs/ip-ranges-list.json macOS builds are automatically restricted within the IP ranges listed here. In other words, you do not have to explicitly set `circleci_ip_ranges: true` for macOS builds. -*macOS IP ranges are not included in the machine-consumable lists maintained in DNS.* Refer to the list above for the most up-to-date macOS IP addresses. Information about changes to macOS IP ranges will be included in the link:https://circleci.com/changelog/[changelog] and will be sent to the technical contact(s) listed under menu:Organization Settings[Overview]. +*macOS IP ranges are not included in the machine-consumable lists maintained in DNS.* Refer to the list above for the most up-to-date macOS IP addresses. Information about changes to macOS IP ranges will be included in the link:https://circleci.com/changelog/[changelog] and will be sent to the technical contact(s) listed under menu:Org[Overview]. diff --git a/docs/guides/modules/security/pages/rename-organizations-and-repositories.adoc b/docs/guides/modules/security/pages/rename-organizations-and-repositories.adoc index 087b637d61..a51216a844 100644 --- a/docs/guides/modules/security/pages/rename-organizations-and-repositories.adoc +++ b/docs/guides/modules/security/pages/rename-organizations-and-repositories.adoc @@ -53,7 +53,7 @@ For CircleCI organizations integrated through the GitHub App, GitLab or Bitbucke You can rename your organization from the CircleCI web app: -. Select **Organization Settings** in the sidebar. +. Select **Org** in the sidebar. . Select btn:[Rename Organization] next to your org name. . Enter a new name for your org and select btn:[Save]. diff --git a/docs/guides/modules/security/pages/set-environment-variable.adoc b/docs/guides/modules/security/pages/set-environment-variable.adoc index b8cf605f8c..4ed5f388e3 100644 --- a/docs/guides/modules/security/pages/set-environment-variable.adoc +++ b/docs/guides/modules/security/pages/set-environment-variable.adoc @@ -80,7 +80,7 @@ NOTE: Integers longer than 6 digits will be converted to an exponential number. [#set-an-environment-variable-in-a-context] == Set an environment variable in a context -. On the CircleCI web app, go to **Organization Settings**. +. In the CircleCI web app, select **Org** from the sidebar. + image::guides:ROOT:org-settings-contexts.png[Contexts] diff --git a/docs/guides/modules/toolkit/pages/chunk-setup-and-overview.adoc b/docs/guides/modules/toolkit/pages/chunk-setup-and-overview.adoc index 588c0789b4..e1fa6154ab 100644 --- a/docs/guides/modules/toolkit/pages/chunk-setup-and-overview.adoc +++ b/docs/guides/modules/toolkit/pages/chunk-setup-and-overview.adoc @@ -71,8 +71,8 @@ The following sections guide you through the Chunk setup process. Once setup is Ensure you have the following in place before you get started: -* The CircleCI GitHub App installed in your organization. Check **Organization Settings** > **VCS Connections**. Chunk needs the GitHub App to recommend fixes and open pull requests. -* The **Allow Chunk tasks** option enabled for your organization. Navigate to **Organization Settings** > **Advanced** and toggle on **Allow Chunk tasks**. +* The CircleCI GitHub App installed in your organization. Check **Org** > **VCS Connections**. Chunk needs the GitHub App to recommend fixes and open pull requests. +* The **Allow Chunk tasks** option enabled for your organization. Navigate to menu:Org[Advanced] and toggle on **Allow Chunk tasks**. * A model provider API key, if you are not using the default CircleCI (Powered by Anthropic) option. See the <> section for details on each provider. *If you are using OpenAI*, you also need to: @@ -212,7 +212,7 @@ If you need to tear down Chunk for your organization, delete your model provider . Locate your model provider API key environment variable and select it using the radio button. . Select **Delete** to delete the environment variable. You will be prompted to confirm the deletion. -NOTE: **CircleCI (Powered by Anthropic) users.** If you are using the CircleCI-managed provider, there is no API key stored in your context. To remove Chunk access, disable the **Allow Chunk tasks** toggle in **Organization Settings** > **Advanced**. +NOTE: **CircleCI (Powered by Anthropic) users.** If you are using the CircleCI-managed provider, there is no API key stored in your context. To remove Chunk access, disable the **Allow Chunk tasks** toggle in menu:Org[Advanced]. == Fix failed builds with Chunk @@ -465,7 +465,7 @@ When using the Chunk chat interface, you can tell Chunk which project, repositor To build and iterate on Chunk's environment, follow these steps: -. Navigate to menu:Organization Settings[Chunk Tasks]. +. Navigate to menu:Org[Tasks]. . Identify your desired agent task. . Select the ellipsis icon (icon:more[Ellipsis icon]) and select **Chunk Environment**. @@ -481,16 +481,16 @@ To improve Chunk's ability to run tests and produce fixes aligned with your styl === I cannot see the Chunk option in the sidebar -If you do not see Chunk image:guides:ROOT:icons/chunk.svg[Chunk icon, role="no-border"] in the sidebar, you may not have the **Allow Chunk tasks** option enabled. Navigate to menu:Organization Settings[Advanced] and toggle on **Allow Chunk tasks**. +If you do not see Chunk image:guides:ROOT:icons/chunk.svg[Chunk icon, role="no-border"] in the sidebar, you may not have the **Allow Chunk tasks** option enabled. Navigate to menu:Org[Advanced] and toggle on **Allow Chunk tasks**. -.Organization settings > Advanced > Allow Chunk tasks +.Org > Advanced > Allow Chunk tasks image::guides:ROOT:chunk/allow-chunk-tasks.png[Allow Chunk tasks] === I cannot get my OpenAI organization verified If organization verification is not possible, you can bypass this requirement by adding an environment variable to your `circleci-agents` context as follows: -. In the CircleCI web app, go to **Organization Settings** > **Contexts**. +. In the CircleCI web app, go to menu:Org[Contexts]. . Use the search to find the `circleci-agents` context. Select it by name to open configuration options. . Scroll down to the "Environment variables" section. . Select **Add environment variable** and enter the following: @@ -512,7 +512,7 @@ You need to make sure your organization has GPT-5 access. To verify this in the === Amazon Bedrock authentication error or 401 -Your AWS bearer token is invalid or has expired. Regenerate the token in AWS IAM and update it in the `circleci-agents` context in **Organization Settings** > **Contexts**. +Your AWS bearer token is invalid or has expired. Regenerate the token in AWS IAM and update it in the `circleci-agents` context in menu:Org[Contexts]. === Amazon Bedrock access denied or 403 on model invocation diff --git a/docs/guides/modules/toolkit/pages/how-to-find-ids.adoc b/docs/guides/modules/toolkit/pages/how-to-find-ids.adoc index 6821924101..1ec3d3a9b2 100644 --- a/docs/guides/modules/toolkit/pages/how-to-find-ids.adoc +++ b/docs/guides/modules/toolkit/pages/how-to-find-ids.adoc @@ -49,7 +49,7 @@ The organization ID is a unique identifier for an organization. You can access the organization ID through the `CIRCLE_ORGANIZATION_ID` xref:get-ids-from-the-built-in-environment-variables[built-in environment variable]. Alternatively, follow these steps to find it in the CircleCI web app: . In the link:https://app.circleci.com[CircleCI web app, window=_blank], select your org from the org cards on your user homepage. -. Navigate to menu:Organization Settings[Overview] in the CircleCI web app. +. Navigate to menu:Org[Overview] in the CircleCI web app. . Note the value or select the btn:[Copy] icon next to the organization ID. diff --git a/docs/guides/modules/toolkit/pages/how-to-use-the-circleci-local-cli.adoc b/docs/guides/modules/toolkit/pages/how-to-use-the-circleci-local-cli.adoc index dc61e80424..0f57f84ff1 100644 --- a/docs/guides/modules/toolkit/pages/how-to-use-the-circleci-local-cli.adoc +++ b/docs/guides/modules/toolkit/pages/how-to-use-the-circleci-local-cli.adoc @@ -349,9 +349,9 @@ For a specific resource class: circleci runner instance list [flags] ---- -- `` is the namespace claimed for your organization. You can see your namespace on the self-hosted runners inventory page in the CircleCI web app, by selecting **Self-Hosted Runners** in the sidebar. +- `` is the namespace claimed for your organization. You can see your namespace on the self-hosted runners inventory page in the CircleCI web app, by selecting **Runners** in the sidebar. -- `` is the label for the resource class of the specific pool of self-hosted runners. You can find the resource class for all your pools in the link:https://app.circleci.com[CircleCI web app], by selecting **Self-Hosted Runners** in the sidebar. +- `` is the label for the resource class of the specific pool of self-hosted runners. You can find the resource class for all your pools in the link:https://app.circleci.com[CircleCI web app], by selecting **Runners** in the sidebar. To find out more on namespace and resource class, see the xref:execution-runner:runner-concepts.adoc#namespaces-and-resource-classes[Self-hosted runner concepts] page. @@ -366,9 +366,9 @@ Use the `resource-class create` sub-command to add a new resource class. circleci runner instance create [flags] ---- -- `` is the namespace claimed for your organization. You can see your namespace on the self-hosted runners inventory page in the CircleCI web app, by selecting **Self-Hosted Runners** in the sidebar. +- `` is the namespace claimed for your organization. You can see your namespace on the self-hosted runners inventory page in the CircleCI web app, by selecting **Runners** in the sidebar. -- `` is the label for the resource class of the specific pool of self-hosted runners. You can find the resource class for all your pools in the link:https://app.circleci.com[CircleCI web app], by selecting **Self-Hosted Runners** in the sidebar. +- `` is the label for the resource class of the specific pool of self-hosted runners. You can find the resource class for all your pools in the link:https://app.circleci.com[CircleCI web app], by selecting **Runners** in the sidebar. - `` is the argument that allows you to provide a description for the resource class. It must be enclosed in double-quotes. @@ -383,9 +383,9 @@ Use the `resource-class delete` sub-command to delete an existing resource class circleci runner resource-class delete [flags] ---- -- `` is the namespace claimed for your organization. You can see your namespace on the self-hosted runners inventory page in the CircleCI web app, by selecting **Self-Hosted Runners** in the sidebar. +- `` is the namespace claimed for your organization. You can see your namespace on the self-hosted runners inventory page in the CircleCI web app, by selecting **Runners** in the sidebar. -- `` is the label for the resource class of the specific pool of self-hosted runners. You can find the resource class for all your pools in the link:https://app.circleci.com[CircleCI web app], by selecting **Self-Hosted Runners** in the sidebar. +- `` is the label for the resource class of the specific pool of self-hosted runners. You can find the resource class for all your pools in the link:https://app.circleci.com[CircleCI web app], by selecting **Runners** in the sidebar. For full details on the `resource-class delete` sub-command, refer to the link:https://circleci-public.github.io/circleci-cli/circleci_runner_resource-class_delete.html[CLI docs]. @@ -401,7 +401,7 @@ circleci runner resource-class list [flags] Alternatively, you can use the shorthand `ls`, instead of `list`. -- `` is the namespace claimed for your organization. You can see your namespace on the self-hosted runners inventory page in the CircleCI web app, by selecting **Self-Hosted Runners** in the sidebar. +- `` is the namespace claimed for your organization. You can see your namespace on the self-hosted runners inventory page in the CircleCI web app, by selecting **Runners** in the sidebar. For full details on the `resource-class list` sub-command, refer to the link:https://circleci-public.github.io/circleci-cli/circleci_runner_resource-class_list.html[CLI docs]. @@ -414,9 +414,9 @@ Use the `token create` sub-command to create a token for a resource class. circleci runner token create [flags] ---- -- `` is the namespace claimed for your organization. You can see your namespace on the self-hosted runners inventory page in the CircleCI web app, by selecting **Self-Hosted Runners** in the sidebar. +- `` is the namespace claimed for your organization. You can see your namespace on the self-hosted runners inventory page in the CircleCI web app, by selecting **Runners** in the sidebar. -- `` is the name of the resource class for the specific pool of self-hosted runners. You can find the resource class for all your pools in the link:https://app.circleci.com[CircleCI web app], by selecting **Self-Hosted Runners** in the sidebar. +- `` is the name of the resource class for the specific pool of self-hosted runners. You can find the resource class for all your pools in the link:https://app.circleci.com[CircleCI web app], by selecting **Runners** in the sidebar. - `` refers to a human-readable name you assign to the token. @@ -434,9 +434,9 @@ circleci runner token list [flags] Alternatively, you can use the shorthand `ls`, instead of `list`. -- `` is the namespace claimed for your organization. You can see your namespace on the self-hosted runners inventory page in the CircleCI web app, by selecting **Self-Hosted Runners** in the sidebar. +- `` is the namespace claimed for your organization. You can see your namespace on the self-hosted runners inventory page in the CircleCI web app, by selecting **Runners** in the sidebar. -- `` is the name of the resource class for the specific pool of self-hosted runners. You can find the resource class for all your pools in the link:https://app.circleci.com[CircleCI web app], by selecting **Self-Hosted Runners** in the sidebar. +- `` is the name of the resource class for the specific pool of self-hosted runners. You can find the resource class for all your pools in the link:https://app.circleci.com[CircleCI web app], by selecting **Runners** in the sidebar. For full details on the `token list` sub-command, refer to the link:https://circleci-public.github.io/circleci-cli/circleci_runner_token_list.html[CLI docs]. @@ -461,7 +461,7 @@ The CircleCI CLI allows you to execute several project-oriented actions. === Create a new project -NOTE: This command only applies to GitLab or GitHub App organizations (Organization slug starts with `circleci` followed by a UUID. For example, `circleci/34R3kN5RtfEE7v4sa4nWAU`. You can find your organization slug under menu:Organization Settings[Overview]). +NOTE: This command only applies to GitLab or GitHub App organizations (Organization slug starts with `circleci` followed by a UUID. For example, `circleci/34R3kN5RtfEE7v4sa4nWAU`. You can find your organization slug under menu:Org[Overview]). Use the `create` sub-command to create a new project. @@ -472,7 +472,7 @@ circleci project create [flags] - `` depends on the type of integration for your organization. This command only supports the `circleci` VCS type. -- `` is the ID of the organization associated with the project. You can find it from the CircleCI web app under menu:Organization Settings[Overview]. +- `` is the ID of the organization associated with the project. You can find it from the CircleCI web app under menu:Org[Overview]. - `--name` is the flag that allows you to provide the project name. If not provided, you will be prompted to enter it. @@ -490,7 +490,7 @@ circleci project secret create [flag - `` depends on the type of integration for your organization. For projects that use GitLab or GitHub App, use `circleci` as `vcs-type`. -- `` is the ID of the organization associated with the project. You can find it from the CircleCI web app under menu:Organization Settings[Overview]. +- `` is the ID of the organization associated with the project. You can find it from the CircleCI web app under menu:Org[Overview]. - `` is the ID of the project associated with the project. You can find it from the CircleCI web app under menu:Project Settings[Overview]. @@ -511,7 +511,7 @@ circleci project secret list - `` depends on the type of integration for your organization. For projects that use GitLab or GitHub App, use `circleci` as `vcs-type`. -- `` is the ID of the organization associated with the project. You can find it from the CircleCI web app under menu:Organization Settings[Overview]. +- `` is the ID of the organization associated with the project. You can find it from the CircleCI web app under menu:Org[Overview]. - `` is the ID of the project associated with the project. You can find it from the CircleCI web app under menu:Project Settings[Overview]. @@ -530,7 +530,7 @@ circleci dlc purge - `` depends on the type of integration for your organization. For projects that use GitLab or GitHub App, use `circleci` as `vcs-type`. -- `` is the ID of the organization associated with the project. You can find it from the CircleCI web app under menu:Organization Settings[Overview]. +- `` is the ID of the organization associated with the project. You can find it from the CircleCI web app under menu:Org[Overview]. - `` is the ID of the project associated with the project. You can find it from the CircleCI web app under menu:Project Settings[Overview]. @@ -546,7 +546,7 @@ The CircleCI CLI allows you to operate on pipelines. You can use the CLI to crea Use the `create` sub-command to create a new pipeline definition for your project. -NOTE: The `create` sub-command of the `pipeline` command only applies to pipeline definitions created with the GitHub App provider Organization slug starts with `circleci` followed by a UUID. For example, `circleci/34R3kN5RtfEE7v4sa4nWAU`. You can find your organization slug under menu:Organization Settings[Overview]). +NOTE: The `create` sub-command of the `pipeline` command only applies to pipeline definitions created with the GitHub App provider Organization slug starts with `circleci` followed by a UUID. For example, `circleci/34R3kN5RtfEE7v4sa4nWAU`. You can find your organization slug under menu:Org[Overview]). [,shell] ---- @@ -584,7 +584,7 @@ Use the `run` sub-command to run a specific pipeline. circleci pipeline run [flags] ---- -- `` is the ID of the organization associated with the pipeline definition. You can find it from the CircleCI web app under menu:Organization Settings[Overview]. +- `` is the ID of the organization associated with the pipeline definition. You can find it from the CircleCI web app under menu:Org[Overview]. - `` is the ID of the project associated with the pipeline definition. You can find it from the CircleCI web app under menu:Project Settings[Overview]. @@ -600,7 +600,7 @@ For full details on the `run` sub-command, refer to the link:https://circleci-pu You can use the CircleCI CLI to create triggers for your projects. -NOTE: The `trigger` command and its `create` sub-command only apply to pipeline definitions created with the GitHub App provider (Organization slug starts with `circleci` followed by a UUID. For example, `circleci/34R3kN5RtfEE7v4sa4nWAU`. You can find your organization slug under menu:Organization Settings[Overview]). +NOTE: The `trigger` command and its `create` sub-command only apply to pipeline definitions created with the GitHub App provider (Organization slug starts with `circleci` followed by a UUID. For example, `circleci/34R3kN5RtfEE7v4sa4nWAU`. You can find your organization slug under menu:Org[Overview]). For full details on creating, testing, and managing triggers for your organization, see the xref:orchestrate:triggers-overview.adoc[Trigger a pipeline] page. @@ -714,7 +714,7 @@ circleci policy fetch --owner-id [flags] ---- - `` is the name of the policy to fetch. It is not required. If you do not provide a policy name, the CLI will fetch all policies for the organization. -- `` is the ID of your organization that owns the policy. You can find it from the CircleCI web app under menu:Organization Settings[Overview]. +- `` is the ID of your organization that owns the policy. You can find it from the CircleCI web app under menu:Org[Overview]. For full details on the `fetch` sub-command, refer to the link:https://circleci-public.github.io/circleci-cli/circleci_policy_fetch.html[CLI docs]. @@ -729,7 +729,7 @@ circleci policy logs --owner-id [flags] ---- - `` is the name of the policy to get decision logs for. It is not required. If you do not provide a policy name, the CLI will get decision logs for all policies in the organization. -- `` is the ID of your organization that owns the policy. You can find it from the CircleCI web app under menu:Organization Settings[Overview]. +- `` is the ID of your organization that owns the policy. You can find it from the CircleCI web app under menu:Org[Overview]. Note that you can filter results using any combination of the following flags: @@ -786,7 +786,7 @@ To set policy decision settings, run the command with the appropriate settings f circleci policy settings --owner-id --enable ---- -- `` is the ID of your organization that owns the policy. You can find it from the CircleCI web app under menu:Organization Settings[Overview]. +- `` is the ID of your organization that owns the policy. You can find it from the CircleCI web app under menu:Org[Overview]. - `--enable` is the flag to either enable or disable a policy evaluation. Set to `true` to enable, `false` to disable. diff --git a/docs/guides/modules/toolkit/pages/intelligent-summaries.adoc b/docs/guides/modules/toolkit/pages/intelligent-summaries.adoc index 23d3114a66..e48a5f95bb 100644 --- a/docs/guides/modules/toolkit/pages/intelligent-summaries.adoc +++ b/docs/guides/modules/toolkit/pages/intelligent-summaries.adoc @@ -12,7 +12,7 @@ The intelligent summaries feature is **disabled** by default. You can opt-in to NOTE: Only organization administrators can enable or disable intelligent summaries. . From the link:https://app.circleci.com/home/[CircleCI web app] select your organization card. -. Select **Organization Settings** from the sidebar. +. Select **Org** from the sidebar. . Select **Advanced** from the menu. . Use the "Enable intelligent summaries of build failure messages" toggle to enable or disable the feature. diff --git a/docs/guides/modules/toolkit/pages/vs-code-extension-overview.adoc b/docs/guides/modules/toolkit/pages/vs-code-extension-overview.adoc index 0f68d25875..79452130df 100644 --- a/docs/guides/modules/toolkit/pages/vs-code-extension-overview.adoc +++ b/docs/guides/modules/toolkit/pages/vs-code-extension-overview.adoc @@ -179,7 +179,7 @@ image::guides:ROOT:vscode-ext-config-test-run-crop.png[Screenshot showing the ru * CircleCI VS Code extension v2.3.0 or higher * A CircleCI account integrated through the GitHub OAuth app, or Bitbucket Cloud. To find out which GitHub account type you have, see the xref:integration:github-integration.adoc[GitHub OAuth app integration] page -* Your org must have opted-in to this feature through Organization Settings. You may need to ask your org admin to do so for you. See <> for more details. +* Your org must have opted-in to this feature through Org settings. You may need to ask your org admin to do so for you. See <> for more details. * Your project must **not** make use of xref:orchestrate:dynamic-config.adoc[dynamic configuration]. This feature is disabled for projects that use dynamic configuration. NOTE: **Unversioned config** in CircleCI indicates that the `.circleci/config.yml` on the branch where the pipeline is running is ignored. Instead, the configuration file is overridden by a custom configuration file passed as a parameter. The term "unversioned" refers to the fact the config file is not versioned in the VCS. It is, however, stored in CircleCI along with the pipeline, and it is available at any time in the CircleCI web app. @@ -206,7 +206,7 @@ The following steps show how to test run a pipeline from the VS Code extension: The ability to trigger pipelines from VS Code can be controlled **at the org level** and **at the project level**. -* Organization level settings can be found under menu:Organization Settings[Advanced]. The setting default is **Off**. Toggle the "Trigger pipelines with unversioned config" option to **On** to opt-in. Organization level settings override project settings, and they can be changed only by organization admins. +* Organization level settings can be found under menu:Org[Advanced]. The setting default is **Off**. Toggle the "Trigger pipelines with unversioned config" option to **On** to opt-in. Organization level settings override project settings, and they can be changed only by organization admins. * Project level settings can be found under menu:Project Settings[Advanced]. The setting default is **On**. Toggle the "Trigger pipelines with unversioned config" option to **Off** to opt-out. diff --git a/docs/orbs/modules/author/pages/create-test-and-publish-a-registry-orb.adoc b/docs/orbs/modules/author/pages/create-test-and-publish-a-registry-orb.adoc index 7b70b72739..5e95c79af9 100644 --- a/docs/orbs/modules/author/pages/create-test-and-publish-a-registry-orb.adoc +++ b/docs/orbs/modules/author/pages/create-test-and-publish-a-registry-orb.adoc @@ -47,7 +47,7 @@ Enter the following command to claim your namespace, if you have not yet claimed circleci namespace create --org-id ---- + -NOTE: Find your organization ID in the CircleCI web app by navigating to *Organization Settings* from the sidebar. +NOTE: Find your organization ID in the CircleCI web app by navigating to *Org* from the sidebar. [#create-your-orb] == Create your orb @@ -132,7 +132,7 @@ In the setup process you will be asked if you would like to save your xref:guide Use xref:guides:security:contexts.adoc#restrict-a-context-to-a-security-group-or-groups[Security Groups] to limit access to users that are allowed to trigger jobs. Only these users will have access to the private xref:guides:toolkit:managing-api-tokens.adoc[Personal API Token]. -xref:guides:security:contexts.adoc#restrict-a-context[Contexts] can be located by navigating to menu:Organization Settings[Contexts] in the web app. After creating your orb, you will have a new context called `orb-publishing`. Select `orb-publishing` and add a **Security Group**. +xref:guides:security:contexts.adoc#restrict-a-context[Contexts] can be located by navigating to menu:Org[Contexts] in the web app. After creating your orb, you will have a new context called `orb-publishing`. Select `orb-publishing` and add a **Security Group**. .Secure contexts video::ImPE969yv08[youtube] diff --git a/docs/orbs/modules/use/pages/managing-url-orbs-allow-lists.adoc b/docs/orbs/modules/use/pages/managing-url-orbs-allow-lists.adoc index 1846ea155c..8fd32baebb 100644 --- a/docs/orbs/modules/use/pages/managing-url-orbs-allow-lists.adoc +++ b/docs/orbs/modules/use/pages/managing-url-orbs-allow-lists.adoc @@ -28,7 +28,7 @@ The allow-list applies organization-wide. Once configured, all projects within t CircleCI web app:: + -- -. Navigate to the menu:Organization Settings[Orbs]. +. Navigate to the menu:Org[Orbs]. . In the *Allowed URL Orb prefixes* section, select btn:[Add]. . Fill out the *Name*, *URL Prefix*, and *Auth* fields. . Select btn:[Add URL Prefix]. @@ -71,7 +71,7 @@ curl -X POST https://circleci.com/docs/api/private/organization/ec1234ec-7d44-xx CircleCI web app:: + -- -. Navigate to menu:Organization Settings[Orbs]. +. Navigate to menu:Org[Orbs]. . Scroll to the *Allowed URL Orb prefixes* section. . Existing allow-list entries are displayed in the table. @@ -118,7 +118,7 @@ curl -X GET https://circleci.com/docs/api/private/organization/ec1234ec-7d44-xxx CircleCI web app:: + -- -. Navigate to menu:Organization Settings[Orbs]. +. Navigate to menu:Org[Orbs]. . Scroll to the *Allowed URL Orb prefixes* section. . Select the btn:[Delete] icon next to the allow-list entry to delete. diff --git a/docs/orbs/modules/use/pages/orb-intro.adoc b/docs/orbs/modules/use/pages/orb-intro.adoc index 94f74c43ce..b818cbaa51 100644 --- a/docs/orbs/modules/use/pages/orb-intro.adoc +++ b/docs/orbs/modules/use/pages/orb-intro.adoc @@ -229,7 +229,7 @@ image::guides:ROOT:orbs-registry.png[Orb Registry] [#orb-designation] === Registry orb designations -CAUTION: In order to use uncertified registry orbs (partner or community), your organization's administrator must opt-in to allow uncertified orb usage on the menu:Organization Settings[Security] page for your org. +CAUTION: In order to use uncertified registry orbs (partner or community), your organization's administrator must opt-in to allow uncertified orb usage on the menu:Org[Security] page for your org. Orbs in the registry will appear with one of three different namespace designations: @@ -267,7 +267,7 @@ NOTE: The orbs page in the CircleCI web app is *not available* on CircleCI Serve NOTE: Private registry orb details pages may only be viewed by logged-in members of your organization. Unpublished orbs will not have linked details pages. -To access the orbs page in the web app, navigate to *Organization Settings* and select *Orbs* from the sidebar. +To access the orbs page in the web app, navigate to *Org* and select *Orbs* from the sidebar. The orbs page lists orbs created within your organization. You can view: