diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/administration/auth/ldap/ldap_synchronization.md | 2 | ||||
| -rw-r--r-- | doc/administration/geo/replication/configuration.md | 4 | ||||
| -rw-r--r-- | doc/ci/components/index.md | 2 | ||||
| -rw-r--r-- | doc/development/sidekiq/idempotent_jobs.md | 2 | ||||
| -rw-r--r-- | doc/integration/jira/dvcs/troubleshooting.md | 4 | ||||
| -rw-r--r-- | doc/security/token_overview.md | 2 | ||||
| -rw-r--r-- | doc/user/group/import/index.md | 2 | ||||
| -rw-r--r-- | doc/user/packages/package_registry/index.md | 2 | ||||
| -rw-r--r-- | doc/user/project/import/repo_by_url.md | 6 | ||||
| -rw-r--r-- | doc/user/project/pages/getting_started/pages_ui.md | 2 | ||||
| -rw-r--r-- | doc/user/project/pages/pages_access_control.md | 5 | ||||
| -rw-r--r-- | doc/user/project/quick_actions.md | 2 | ||||
| -rw-r--r-- | doc/user/public_access.md | 2 |
13 files changed, 18 insertions, 19 deletions
diff --git a/doc/administration/auth/ldap/ldap_synchronization.md b/doc/administration/auth/ldap/ldap_synchronization.md index 366ef18ab4c..35d9cf1a068 100644 --- a/doc/administration/auth/ldap/ldap_synchronization.md +++ b/doc/administration/auth/ldap/ldap_synchronization.md @@ -514,7 +514,7 @@ GitLab administrators can remove this permission from group Owners: 1. [Configure LDAP](index.md#configure-ldap). 1. On the left sidebar, at the bottom, select **Admin Area**. -1. On the left sidebar, select **Settings > General**. +1. Select **Settings > General**. 1. Expand **Visibility and access controls**. 1. Ensure the **Allow group owners to manage LDAP-related settings** checkbox is not checked. diff --git a/doc/administration/geo/replication/configuration.md b/doc/administration/geo/replication/configuration.md index 141da62d01b..b50f86dcf47 100644 --- a/doc/administration/geo/replication/configuration.md +++ b/doc/administration/geo/replication/configuration.md @@ -326,7 +326,7 @@ method to be enabled. This is enabled by default, but if converting an existing On the **primary** site: 1. On the left sidebar, at the bottom, select **Admin Area**. -1. On the left sidebar, select **Settings > General**. +1. Select **Settings > General**. 1. Expand **Visibility and access controls**. 1. If using Git over SSH, then: 1. Ensure "Enabled Git access protocols" is set to "Both SSH and HTTP(S)". @@ -339,7 +339,7 @@ You can sign in to the **secondary** site with the same credentials you used wit the **primary** site. After you sign in: 1. On the left sidebar, at the bottom, select **Admin Area**. -1. On the left sidebar, select **Geo > Sites**. +1. Select **Geo > Sites**. 1. Verify that it's correctly identified as a **secondary** Geo site, and that Geo is enabled. diff --git a/doc/ci/components/index.md b/doc/ci/components/index.md index f052fbf98b6..e67f636b14f 100644 --- a/doc/ci/components/index.md +++ b/doc/ci/components/index.md @@ -167,7 +167,7 @@ To make published versions of a component project visible in the CI/CD catalog, you must set the project as a catalog resource: 1. On the left sidebar, select **Search or go to** and find your project. -1. On the left sidebar, select **Settings > General**. +1. Select **Settings > General**. 1. Expand **Visibility, project features, permissions**. 1. Scroll down to **CI/CD Catalog resource** and select the toggle to mark the project as a catalog resource. diff --git a/doc/development/sidekiq/idempotent_jobs.md b/doc/development/sidekiq/idempotent_jobs.md index 193e8fecaed..30e41884870 100644 --- a/doc/development/sidekiq/idempotent_jobs.md +++ b/doc/development/sidekiq/idempotent_jobs.md @@ -30,7 +30,7 @@ an unstarted job with the same arguments is already in the queue. Make sure the worker tests pass using the following shared example: ```ruby -include_examples 'an idempotent worker' do +it_behaves_like 'an idempotent worker' do it 'marks the MR as merged' do # Using subject inside this block will process the job multiple times subject diff --git a/doc/integration/jira/dvcs/troubleshooting.md b/doc/integration/jira/dvcs/troubleshooting.md index 02ab40b7deb..ee697f1bffd 100644 --- a/doc/integration/jira/dvcs/troubleshooting.md +++ b/doc/integration/jira/dvcs/troubleshooting.md @@ -138,7 +138,7 @@ In the example above, the merge requests feature is disabled. To resolve the issue, enable the relevant feature: 1. On the left sidebar, select **Search or go to** and find your project. -1. On the left sidebar, select **Settings > General**. +1. Select **Settings > General**. 1. Expand **Visibility, project features, permissions**. 1. Use the toggles to enable the features as needed. @@ -147,7 +147,7 @@ To resolve the issue, enable the relevant feature: To find webhook logs in a DVCS-linked project: 1. On the left sidebar, select **Search or go to** and find your project. -1. On the left sidebar, select **Settings > Webhooks**. +1. Select **Settings > Webhooks**. 1. Scroll down to **Project Hooks**. 1. Next to the log that points to your Jira instance, select **Edit**. 1. Scroll down to **Recent events**. diff --git a/doc/security/token_overview.md b/doc/security/token_overview.md index 25ecb7f76e2..4555459e7c5 100644 --- a/doc/security/token_overview.md +++ b/doc/security/token_overview.md @@ -234,7 +234,7 @@ The following tables show the prefixes for each type of token where applicable. | Impersonation token | Not applicable. | | Project access token | Not applicable. | | Group access token | Not applicable. | -| Deploy token | Not applicable. | +| Deploy token | `gldt-` ([Added in GitLab 16.7](https://gitlab.com/gitlab-org/gitlab/-/issues/376752)) | | Deploy key | Not applicable. | | Runner registration token | Not applicable. | | Runner authentication token | `glrt-` | diff --git a/doc/user/group/import/index.md b/doc/user/group/import/index.md index ee9c04055c5..28878855098 100644 --- a/doc/user/group/import/index.md +++ b/doc/user/group/import/index.md @@ -626,7 +626,7 @@ Prerequisites: To enable import and export for a group: 1. On the left sidebar, at the bottom, select **Admin Area**. -1. On the left sidebar, select **Settings > General**. +1. Select **Settings > General**. 1. Expand **Visibility and access controls**. 1. In the **Import sources** section, select the checkboxes for the sources you want. diff --git a/doc/user/packages/package_registry/index.md b/doc/user/packages/package_registry/index.md index d6e3f8a8711..6a4e7c0d6a5 100644 --- a/doc/user/packages/package_registry/index.md +++ b/doc/user/packages/package_registry/index.md @@ -154,7 +154,7 @@ Registry disables all package registry operations. To allow anyone to pull from the package registry, regardless of project visibility: 1. On the left sidebar, select **Search or go to** and find your private or internal project. -1. On the left sidebar, select **Settings > General**. +1. Select **Settings > General**. 1. Expand **Visibility, project features, permissions**. 1. Turn on the **Allow anyone to pull from Package Registry** toggle. 1. Select **Save changes**. diff --git a/doc/user/project/import/repo_by_url.md b/doc/user/project/import/repo_by_url.md index eb710115b74..5d67d10582d 100644 --- a/doc/user/project/import/repo_by_url.md +++ b/doc/user/project/import/repo_by_url.md @@ -19,10 +19,8 @@ You can import your existing repositories by providing the Git URL. ## Import project by URL -1. On the left sidebar, select **Search or go to**. -1. Select **View all my projects**. -1. On the right of the page, select **New project**. -1. Select the **Import project** tab. +1. On the left sidebar, at the top, select **Create new** (**{plus}**) and **New project/repository**. +1. Select **Import project**. 1. Select **Repository by URL**. 1. Enter a **Git repository URL**. 1. Complete the remaining fields. diff --git a/doc/user/project/pages/getting_started/pages_ui.md b/doc/user/project/pages/getting_started/pages_ui.md index ce17ebd5c3d..25f91880d5a 100644 --- a/doc/user/project/pages/getting_started/pages_ui.md +++ b/doc/user/project/pages/getting_started/pages_ui.md @@ -34,7 +34,7 @@ a pipeline deploys your Pages website. To complete the setup and generate a GitLab Pages deployment: 1. On the left sidebar, select **Search or go to** and find your project. -1. On the left sidebar, select **Deploy > Pages**. +1. Select **Deploy > Pages**. A **Get Started with Pages** form appears. If this form is not available, see [Troubleshooting](#if-the-get-started-with-pages-form-is-not-available). diff --git a/doc/user/project/pages/pages_access_control.md b/doc/user/project/pages/pages_access_control.md index d7e3b1431ac..1c7aa0f182c 100644 --- a/doc/user/project/pages/pages_access_control.md +++ b/doc/user/project/pages/pages_access_control.md @@ -15,8 +15,9 @@ on your GitLab instance. When enabled, only authenticated <i class="fa fa-youtube-play youtube" aria-hidden="true"></i> For a demonstration, see [Pages access controls](https://www.youtube.com/watch?v=tSPAr5mQYc8). -1. Navigate to your project's **Settings > General** and expand **Visibility, project features, permissions**. - +1. On the left sidebar, select **Search or go to** and find your group. +1. Select **Settings > General**. +1. Expand **Visibility, project features, permissions**. 1. Toggle the **Pages** button to enable the access control. If you don't see the toggle button, that means it isn't enabled. Ask your administrator to [enable it](../../../administration/pages/index.md#access-control). diff --git a/doc/user/project/quick_actions.md b/doc/user/project/quick_actions.md index f265cb37323..be119275cd3 100644 --- a/doc/user/project/quick_actions.md +++ b/doc/user/project/quick_actions.md @@ -54,7 +54,6 @@ To auto-format this table, use the VS Code Markdown Table formatter: `https://do | `/assign me` | **{check-circle}** Yes | **{check-circle}** Yes | **{dotted-circle}** No | Assign yourself. | | `/assign_reviewer @user1 @user2` or `/reviewer @user1 @user2` or `/request_review @user1 @user2` | **{dotted-circle}** No | **{check-circle}** Yes | **{dotted-circle}** No | Assign one or more users as reviewers. | | `/assign_reviewer me` or `/reviewer me` or `/request_review me` | **{dotted-circle}** No | **{check-circle}** Yes | **{dotted-circle}** No | Assign yourself as a reviewer. | -| `/award :emoji:` | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes | Toggle an emoji reaction. | | `/blocked_by <issue1> <issue2>` | **{check-circle}** Yes | **{dotted-circle}** No | **{dotted-circle}** No | Mark the issue as blocked by other issues. The `<issue>` value should be in the format of `#issue`, `group/project#issue`, or the full issue URL. ([Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/214232) in GitLab 16.0). | | `/blocks <issue1> <issue2>` | **{check-circle}** Yes | **{dotted-circle}** No | **{dotted-circle}** No | Mark the issue as blocking other issues. The `<issue>` value should be in the format of `#issue`, `group/project#issue`, or the full issue URL. ([Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/214232) in GitLab 16.0). | | `/cc @user` | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes | Mention a user. In GitLab 15.0 and later, this command performs no action. You can instead type `CC @user` or only `@user`. [In GitLab 14.9 and earlier](https://gitlab.com/gitlab-org/gitlab/-/issues/31200), mentioning a user at the start of a line created a specific type of to-do item notification. | @@ -87,6 +86,7 @@ To auto-format this table, use the VS Code Markdown Table formatter: `https://do | `/promote_to_incident` | **{check-circle}** Yes | **{dotted-circle}** No | **{dotted-circle}** No | Promote issue to incident ([introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/296787) in GitLab 14.5). In [GitLab 15.8 and later](https://gitlab.com/gitlab-org/gitlab/-/issues/376760), you can also use the quick action when creating a new issue. | | `/promote` | **{check-circle}** Yes | **{dotted-circle}** No | **{dotted-circle}** No | Promote issue to epic. | | `/publish` | **{check-circle}** Yes | **{dotted-circle}** No | **{dotted-circle}** No | Publish issue to an associated [Status Page](../../operations/incident_management/status_page.md). | +| `/react :emoji:` | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes | Toggle an emoji reaction. [Renamed](https://gitlab.com/gitlab-org/gitlab/-/issues/409884) from `/award` in GitLab 16.7. `/award` is still available as an aliased command. | | `/ready` | **{dotted-circle}** No | **{check-circle}** Yes | **{dotted-circle}** No | Set the [ready status](merge_requests/drafts.md#mark-merge-requests-as-ready) ([Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90361) in GitLab 15.1). | | `/reassign @user1 @user2` | **{check-circle}** Yes | **{check-circle}** Yes | **{dotted-circle}** No | Replace current assignees with those specified. | | `/reassign_reviewer @user1 @user2` | **{dotted-circle}** No | **{check-circle}** Yes | **{dotted-circle}** No | Replace current reviewers with those specified. | diff --git a/doc/user/public_access.md b/doc/user/public_access.md index 3d82a1709e3..4efd9830a62 100644 --- a/doc/user/public_access.md +++ b/doc/user/public_access.md @@ -67,7 +67,7 @@ Prerequisites: - You must have the Owner role for a project. 1. On the left sidebar, select **Search or go to** and find your project. -1. On the left sidebar, select **Settings > General**. +1. Select **Settings > General**. 1. Expand **Visibility, project features, permissions**. 1. Change **Project visibility** to either **Private**, **Internal**, or **Public**. The visibility setting for a project must be at least as restrictive |