diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-07 21:08:29 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-07 21:08:29 +0300 |
commit | c2bdb9d02768a61bee7560113f4d4c83dc91338e (patch) | |
tree | e242f8d39df80ec39a59eb73ad96ee389c8a4d41 /doc/user | |
parent | fe4751154c331e35c0e6575a3aedc02b210a1c63 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user')
-rw-r--r-- | doc/user/admin_area/settings/continuous_integration.md | 22 | ||||
-rw-r--r-- | doc/user/admin_area/settings/img/continuous_integration_shared_runner_details_input_v14_10.png | bin | 0 -> 10770 bytes | |||
-rw-r--r-- | doc/user/admin_area/settings/img/continuous_integration_shared_runner_details_v14_0.png | bin | 80106 -> 0 bytes | |||
-rw-r--r-- | doc/user/admin_area/settings/img/continuous_integration_shared_runner_details_v14_10.png | bin | 0 -> 9849 bytes | |||
-rw-r--r-- | doc/user/group/iterations/index.md | 6 | ||||
-rw-r--r-- | doc/user/markdown.md | 1 | ||||
-rw-r--r-- | doc/user/project/settings/import_export.md | 2 | ||||
-rw-r--r-- | doc/user/shortcuts.md | 6 |
8 files changed, 28 insertions, 9 deletions
diff --git a/doc/user/admin_area/settings/continuous_integration.md b/doc/user/admin_area/settings/continuous_integration.md index 0330d89aedc..7d968ff5e86 100644 --- a/doc/user/admin_area/settings/continuous_integration.md +++ b/doc/user/admin_area/settings/continuous_integration.md @@ -28,7 +28,18 @@ From now on, every existing project and newly created ones that don't have a If you want to disable it for a specific project, you can do so in [its settings](../../../topics/autodevops/index.md#enable-or-disable-auto-devops). -## Shared runner details +## Enable shared runners for new projects + +You can set all new projects to have the instance's shared runners available by default. + +1. On the top bar, select **Menu > Admin**. +1. On the left sidebar, select **Settings > CI/CD**. +1. Expand **Continuous Integration and Deployment**. +1. Select the **Enable shared runners for new projects** checkbox. + +Any time a new project is created, the shared runners are available. + +## Add a message for shared runners To display details about the instance's shared runners in all projects' runner settings: @@ -36,16 +47,17 @@ runner settings: 1. On the top bar, select **Menu > Admin**. 1. On the left sidebar, select **Settings > CI/CD**. 1. Expand **Continuous Integration and Deployment**. -1. Enter your shared runner details in the **Shared runner details** field. +1. Enter text, including Markdown if you want, in the **Shared runner details** field. For example: + + ![Shared runner details input](img/continuous_integration_shared_runner_details_input_v14_10.png) -You can use [Markdown](../../markdown.md) for improved formatting. To see the rendered -details: +To view the rendered details: 1. On the top bar, select **Menu > Project** and select any group or project. 1. On the left sidebar, select **Settings > CI/CD**. 1. Expand **Runners**. -![Shared runner details example](img/continuous_integration_shared_runner_details_v14_0.png) +![Shared runner details example](img/continuous_integration_shared_runner_details_v14_10.png) ## Maximum artifacts size diff --git a/doc/user/admin_area/settings/img/continuous_integration_shared_runner_details_input_v14_10.png b/doc/user/admin_area/settings/img/continuous_integration_shared_runner_details_input_v14_10.png Binary files differnew file mode 100644 index 00000000000..08451f36962 --- /dev/null +++ b/doc/user/admin_area/settings/img/continuous_integration_shared_runner_details_input_v14_10.png diff --git a/doc/user/admin_area/settings/img/continuous_integration_shared_runner_details_v14_0.png b/doc/user/admin_area/settings/img/continuous_integration_shared_runner_details_v14_0.png Binary files differdeleted file mode 100644 index d8bc3deccd4..00000000000 --- a/doc/user/admin_area/settings/img/continuous_integration_shared_runner_details_v14_0.png +++ /dev/null diff --git a/doc/user/admin_area/settings/img/continuous_integration_shared_runner_details_v14_10.png b/doc/user/admin_area/settings/img/continuous_integration_shared_runner_details_v14_10.png Binary files differnew file mode 100644 index 00000000000..64bd9cf6911 --- /dev/null +++ b/doc/user/admin_area/settings/img/continuous_integration_shared_runner_details_v14_10.png diff --git a/doc/user/group/iterations/index.md b/doc/user/group/iterations/index.md index 999d4b15cb0..8453c5cf4bd 100644 --- a/doc/user/group/iterations/index.md +++ b/doc/user/group/iterations/index.md @@ -45,7 +45,7 @@ From there you can create a new iteration or select an iteration to get a more d WARNING: Manual iteration management is in its end-of-life process. Creating an iteration is [deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/356069) -for use in GitLab 14.10, and is planned for removal in GitLab 15.6. +for use in GitLab 14.10, and is planned for removal in GitLab 16.0. Prerequisites: @@ -66,7 +66,7 @@ To create an iteration: WARNING: Editing all attributes, with the exception of `description` is [deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/356069) -for use in GitLab 14.10, and is planned for removal in GitLab 15.6. +for use in GitLab 14.10, and is planned for removal in GitLab 16.0. In the future only editing an iteration's `description` will be allowed. Prerequisites: @@ -82,7 +82,7 @@ To edit an iteration, select the three-dot menu (**{ellipsis_v}**) > **Edit**. WARNING: Manual iteration management is in its end-of-life process. Deleting an iteration is [deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/356069) -for use in GitLab 14.10, and is planned for removal in GitLab 15.6. +for use in GitLab 14.10, and is planned for removal in GitLab 16.0. Prerequisites: diff --git a/doc/user/markdown.md b/doc/user/markdown.md index 5d7c480143a..a98a032078d 100644 --- a/doc/user/markdown.md +++ b/doc/user/markdown.md @@ -525,6 +525,7 @@ GitLab Flavored Markdown recognizes the following: | merge request | `!123` | `namespace/project!123` | `project!123` | | snippet | `$123` | `namespace/project$123` | `project$123` | | [epic](group/epics/index.md) | `&123` | `group1/subgroup&123` | | +| [iteration](group/iterations/index.md) | `*iteration:"iteration title"`| | | | [vulnerability](application_security/vulnerabilities/index.md) <sup>1</sup> | `[vulnerability:123]` | `[vulnerability:namespace/project/123]` | `[vulnerability:project/123]` | | feature flag | `[feature_flag:123]` | `[feature_flag:namespace/project/123]` | `[feature_flag:project/123]` | | label by ID | `~123` | `namespace/project~123` | `project~123` | diff --git a/doc/user/project/settings/import_export.md b/doc/user/project/settings/import_export.md index 4fe12320f77..30261ed5082 100644 --- a/doc/user/project/settings/import_export.md +++ b/doc/user/project/settings/import_export.md @@ -238,7 +238,7 @@ and the exports between them are compatible. ### Project fails to import due to mismatch -If the [shared runners enablement](../../../ci/runners/runners_scope.md#enable-shared-runners) +If the [shared runners enablement](../../../ci/runners/runners_scope.md#enable-shared-runners-for-a-project) does not match between the exported project, and the project import, the project fails to import. Review [issue 276930](https://gitlab.com/gitlab-org/gitlab/-/issues/276930), and either: diff --git a/doc/user/shortcuts.md b/doc/user/shortcuts.md index e807f251da1..e5285d63cf4 100644 --- a/doc/user/shortcuts.md +++ b/doc/user/shortcuts.md @@ -101,6 +101,12 @@ These shortcuts are available when viewing issues and [merge requests](project/m | <kbd>b</kbd> | Copy source branch name (merge requests only). | | <kbd>.</kbd> | Open the [Web IDE](project/web_ide/index.md). | +Merge requests additionally support the following shortcuts: + +| macOS shortcut | Windows shortcut | Description | +|---------------------------------|---------------------|-------------| +| <kbd>Command</kbd> + <kbd>p</kbd> | <kbd>Control</kbd> + <kbd>p</kbd> | Search for, and then jump to a file for review. | + ### Project files These shortcuts are available when browsing the files in a project (go to |