diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-15 18:10:07 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-15 18:10:07 +0300 |
commit | 12a224d5db7aebdb30cda8ffb75c69fc66d07096 (patch) | |
tree | b76fd3f006aef2f6cc81a2df18fc73dcf1727bb8 /doc | |
parent | 8470023ba6ca065d0491c37c33e2348e499df8b3 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
30 files changed, 54 insertions, 202 deletions
diff --git a/doc/administration/geo/disaster_recovery/background_verification.md b/doc/administration/geo/disaster_recovery/background_verification.md index 6d7240a9f92..a67edc815c8 100644 --- a/doc/administration/geo/disaster_recovery/background_verification.md +++ b/doc/administration/geo/disaster_recovery/background_verification.md @@ -143,10 +143,7 @@ If the **primary** and **secondary** sites have a checksum verification mismatch 1. On the left sidebar, select **Overview > Projects**. 1. Find the project that you want to check the checksum differences and select its name. - 1. On the project administration page get the **Gitaly storage name**, - and **Gitaly relative path**. - - ![Project administration page](img/checksum-differences-admin-project-page.png) + 1. On the project administration page, get the values in the **Storage name** and **Relative path** fields. 1. On a **Gitaly node on the primary** site and a **Gitaly node on the secondary** site, go to the project's repository directory. If using Gitaly Cluster, [check that it is in a healthy state](../../gitaly/troubleshooting.md#check-cluster-health) prior to running these commands. diff --git a/doc/administration/geo/disaster_recovery/img/checksum-differences-admin-project-page.png b/doc/administration/geo/disaster_recovery/img/checksum-differences-admin-project-page.png Binary files differdeleted file mode 100644 index 0a7b841897b..00000000000 --- a/doc/administration/geo/disaster_recovery/img/checksum-differences-admin-project-page.png +++ /dev/null diff --git a/doc/administration/gitaly/praefect.md b/doc/administration/gitaly/praefect.md index 9577c4a4cb2..31dc85364b4 100644 --- a/doc/administration/gitaly/praefect.md +++ b/doc/administration/gitaly/praefect.md @@ -1020,10 +1020,10 @@ Particular attention should be shown to: - The `gitaly['configuration'][:auth][:token]` configured in this section must match the `token` value under `praefect['configuration'][:virtual_storage][<index>][:node][<index>][:token]` on the Praefect node. This value was set in the [previous section](#praefect). This document uses the placeholder `PRAEFECT_INTERNAL_TOKEN` throughout. -- The storage names in `gitaly['configuration'][:storage]` configured in this section must match the - storage names under `praefect['configuration'][:virtual_storage]` on the Praefect node. This +- The physical storage names in `gitaly['configuration'][:storage]` configured in this section must match the + physical storage names under `praefect['configuration'][:virtual_storage]` on the Praefect node. This was set in the [previous section](#praefect). This document uses `gitaly-1`, - `gitaly-2`, and `gitaly-3` as Gitaly storage names. + `gitaly-2`, and `gitaly-3` as physical storage names. For more information on Gitaly server configuration, see our [Gitaly documentation](configure_gitaly.md#configure-gitaly-servers). diff --git a/doc/administration/repository_storage_types.md b/doc/administration/repository_storage_types.md index e1512038286..6e47d3099bd 100644 --- a/doc/administration/repository_storage_types.md +++ b/doc/administration/repository_storage_types.md @@ -29,9 +29,7 @@ The repository storage types documented here apply to any repository storage def ## Hashed storage -> - [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/28283) in GitLab 10.0. -> - Made the default for new installations in GitLab 12.0. -> - Enabled by default for new and renamed projects in GitLab 13.0. +> **Storage name** field [renamed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/128416) from **Gitaly storage name** and **Relative path** field [renamed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/128416) from **Gitaly relative path** in GitLab 16.3. Hashed storage stores projects on disk in a location based on a hash of the project's ID. Hashed storage is different to [legacy storage](#legacy-storage) where a project is stored based on: @@ -81,12 +79,11 @@ To look up a project's hash path in the Admin Area: 1. On the left sidebar, expand the top-most chevron (**{chevron-down}**). 1. Select **Admin Area**. 1. On the left sidebar, select **Overview > Projects** and select the project. +1. Locate the **Relative path** field. The value is similar to: -The **Gitaly relative path** is displayed there and looks similar to: - -```plaintext -"@hashed/b1/7e/b17ef6d19c7a5b1ee83b907c595526dcb1eb06db8227d650d5dda0a9f4ce8cd9.git" -``` + ```plaintext + "@hashed/b1/7e/b17ef6d19c7a5b1ee83b907c595526dcb1eb06db8227d650d5dda0a9f4ce8cd9.git" + ``` To look up a project's hash path using a Rails console: @@ -100,7 +97,7 @@ To look up a project's hash path using a Rails console: #### From hashed path to project name -Administrators can look up a project's name from its hashed storage path using: +Administrators can look up a project's name from its hashed relative path using: - A Rails console. - The `config` file in the `*.git` directory. diff --git a/doc/administration/server_hooks.md b/doc/administration/server_hooks.md index 82360581504..e2f08f548e6 100644 --- a/doc/administration/server_hooks.md +++ b/doc/administration/server_hooks.md @@ -74,7 +74,8 @@ To create server hooks for a repository: 1. On the left sidebar, expand the top-most chevron (**{chevron-down}**). 1. Select **Admin Area**. 1. Go to **Overview > Projects** and select the project you want to add a server hook to. -1. On the page that appears, locate the value of **Gitaly relative path**. This path is where server hooks must be located. +1. On the page that appears, locate the value of **Relative path**. This path is where server + hooks must be located. - If you are using [hashed storage](repository_storage_types.md#hashed-storage), see [Translate hashed storage paths](repository_storage_types.md#translate-hashed-storage-paths) for information on interpreting the relative path. diff --git a/doc/development/documentation/styleguide/word_list.md b/doc/development/documentation/styleguide/word_list.md index b983002dbed..d65df0b56c8 100644 --- a/doc/development/documentation/styleguide/word_list.md +++ b/doc/development/documentation/styleguide/word_list.md @@ -1424,6 +1424,17 @@ Instead of **and/or**, use **or** or re-write the sentence. This rule also appli Do not use **slave**. Another option is **secondary**. ([Vale](../testing.md#vale) rule: [`InclusionCultural.yml`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/.vale/gitlab/InclusionCultural.yml)) +## storages + +In the context of: + +- Gitaly, storage is physical and must be called a **storage**. +- Gitaly Cluster, storage can be either: + - Virtual and must be called a **virtual storage**. + - Physical and must be called a **physical storage**. + +Gitaly storages have physical paths and virtual storages have virtual paths. + ## subgroup Use **subgroup** (no hyphen) instead of **sub-group**. ([Vale](../testing.md#vale) rule: [`SubstitutionSuggestions.yml`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/.vale/gitlab/SubstitutionSuggestions.yml)) diff --git a/doc/development/fe_guide/vuex.md b/doc/development/fe_guide/vuex.md index 5f29955c1cb..06d7070b855 100644 --- a/doc/development/fe_guide/vuex.md +++ b/doc/development/fe_guide/vuex.md @@ -40,6 +40,7 @@ applications stored in this [repository](https://gitlab.com/gitlab-org/gitlab/-/ This is the entry point for our store. You can use the following as a guide: ```javascript +// eslint-disable-next-line no-restricted-imports import Vuex from 'vuex'; import * as actions from './actions'; import * as getters from './getters'; @@ -287,6 +288,7 @@ function when mounting your Vue component: // in the Vue app's initialization script (for example, mount_show.js) import Vue from 'vue'; +// eslint-disable-next-line no-restricted-imports import Vuex from 'vuex'; import { createStore } from './stores'; import AwesomeVueApp from './components/awesome_vue_app.vue' @@ -372,6 +374,7 @@ when [providing data to a Vue app](vue.md#providing-data-from-haml-to-javascript ```javascript <script> +// eslint-disable-next-line no-restricted-imports import { mapActions, mapState, mapGetters } from 'vuex'; export default { @@ -433,6 +436,7 @@ components, we need to include the store and provide the correct state: ```javascript //component_spec.js import Vue from 'vue'; +// eslint-disable-next-line no-restricted-imports import Vuex from 'vuex'; import { mount } from '@vue/test-utils'; import { createStore } from './store'; diff --git a/doc/development/i18n/externalization.md b/doc/development/i18n/externalization.md index 60f18032460..f4ace7491eb 100644 --- a/doc/development/i18n/externalization.md +++ b/doc/development/i18n/externalization.md @@ -169,9 +169,9 @@ If you need to translate strings in the Vue component's JavaScript, you can impo To test Vue translations, learn about [manually testing translations from the UI](#manually-test-translations-from-the-ui). -### Test files +### Test files (RSpec) -Test expectations against externalized contents should not be hard coded, +For RSpec tests, expectations against externalized contents should not be hard coded, because we may need to run the tests with non-default locale, and tests with hard coded contents will fail. @@ -194,18 +194,19 @@ click_button _('Submit review') expect(rendered).to have_content(_('Thank you for your feedback!')) ``` -This includes JavaScript tests: +### Test files (Jest) -Bad: +For Frontend Jest tests, expectations do not need to reference externalization methods. Externalization is mocked +in the Frontend test environment, so the expectations are deterministic across locales +([see relevant MR](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/128531)). -```javascript -expect(findUpdateIgnoreStatusButton().text()).toBe('Ignore'); -``` - -Good: +Example: ```javascript -expect(findUpdateIgnoreStatusButton().text()).toBe(__('Ignore')); +// Bad. Not necessary in Frontend environment. +expect(findText()).toBe(__('Lorem ipsum dolar sit')); +// Good. +expect(findText()).toBe('Lorem ipsum dolar sit'); ``` #### Recommendations diff --git a/doc/development/testing_guide/best_practices.md b/doc/development/testing_guide/best_practices.md index 1b418a3d851..178e038264d 100644 --- a/doc/development/testing_guide/best_practices.md +++ b/doc/development/testing_guide/best_practices.md @@ -621,11 +621,11 @@ You can use the `be_axe_clean` matcher to run [axe automated accessibility testi ##### Externalized contents -Test expectations against externalized contents should call the same +For RSpec tests, expectations against externalized contents should call the same externalizing method to match the translation. For example, you should use the `_` -method in Ruby and `__` method in JavaScript. +method in Ruby. -See [Internationalization for GitLab - Test files](../i18n/externalization.md#test-files) for details. +See [Internationalization for GitLab - Test files (RSpec)](../i18n/externalization.md#test-files-rspec) for details. ##### Actions diff --git a/doc/development/value_stream_analytics.md b/doc/development/value_stream_analytics.md index 30244407e38..955fc88c713 100644 --- a/doc/development/value_stream_analytics.md +++ b/doc/development/value_stream_analytics.md @@ -6,7 +6,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w # Value stream analytics development guidelines -For information on how to configure value stream analytics (VSA) in GitLab, see our [analytics documentation](../user/analytics/value_stream_analytics.md). +For information on how to configure value stream analytics (VSA) in GitLab, see our [analytics documentation](../user/group/value_stream_analytics/index.md). ## How does Value Stream Analytics work? @@ -290,7 +290,7 @@ considered legacy, which will be phased out at some point. ## Frontend -[Project VSA](../user/analytics/value_stream_analytics.md) is available for all users and: +[Project VSA](../user/group/value_stream_analytics/index.md) is available for all users and: - Includes a mixture of key and DORA metrics based on the tier. - Uses the set of [default stages](#default-stages). diff --git a/doc/integration/jira/jira_cloud_configuration.md b/doc/integration/jira/jira_cloud_configuration.md deleted file mode 100644 index 83321df0420..00000000000 --- a/doc/integration/jira/jira_cloud_configuration.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -redirect_to: 'configure.md#create-a-jira-cloud-api-token' -remove_date: '2023-07-07' ---- - -This document was moved to [another location](configure.md#create-a-jira-cloud-api-token). - -<!-- This redirect file can be deleted after <2023-07-07>. --> -<!-- Redirects that point to other docs in the same project expire in three months. --> -<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. --> -<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html --> diff --git a/doc/topics/plan_and_track.md b/doc/topics/plan_and_track.md index 67d5e996837..35365cc1975 100644 --- a/doc/topics/plan_and_track.md +++ b/doc/topics/plan_and_track.md @@ -54,7 +54,7 @@ Align your work across teams. Use these day-to-day planning features. -- [Your work sidebar](../topics/your_work.md) +- [Your work sidebar](../tutorials/left_sidebar/index.md) - [Keyboard shortcuts](../user/shortcuts.md) - [Quick actions](../user/project/quick_actions.md) - [Markdown](../user/markdown.md) diff --git a/doc/topics/your_work.md b/doc/topics/your_work.md deleted file mode 100644 index c57c9b52604..00000000000 --- a/doc/topics/your_work.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -redirect_to: '../tutorials/left_sidebar/index.md' -remove_date: '2023-08-03' ---- - -This document was moved to [another location](../tutorials/left_sidebar/index.md). - -<!-- This redirect file can be deleted after <2023-08-03>. --> -<!-- Redirects that point to other docs in the same project expire in three months. --> -<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. --> -<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html --> diff --git a/doc/tutorials/agile_sprint.md b/doc/tutorials/agile_sprint.md deleted file mode 100644 index 84927fe0a66..00000000000 --- a/doc/tutorials/agile_sprint.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -redirect_to: 'agile_sprint/index.md' -remove_date: '2023-07-21' ---- - -This document was moved to [another location](agile_sprint/index.md). - -<!-- This redirect file can be deleted after 2023-07-21. --> -<!-- Redirects that point to other docs in the same project expire in three months. --> -<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. --> -<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->
\ No newline at end of file diff --git a/doc/tutorials/agile_sprint/index.md b/doc/tutorials/agile_sprint/index.md index fe106af2dc2..a1a2cd13f40 100644 --- a/doc/tutorials/agile_sprint/index.md +++ b/doc/tutorials/agile_sprint/index.md @@ -47,9 +47,7 @@ When creating an iteration cadence, you can decide whether to automatically mana disable the automated scheduling to [manually manage the iterations](../../user/group/iterations/index.md#manual-iteration-management). -Similar to membership, iterations cascade down your group, subgroup, and project hierarchy. If your -team works across many groups, subgroups, and projects, create the iteration cadence in the top-most -group shared by all projects that contain the team's issues as illustrated by the diagram below. +Similar to membership, iterations cascade down your group, subgroup, and project hierarchy. If your team has multiple groups and projects, create the iteration cadence in the top-most shared group: ```mermaid graph TD diff --git a/doc/tutorials/convert_personal_namespace_into_group.md b/doc/tutorials/convert_personal_namespace_into_group.md deleted file mode 100644 index c1b3b58efb8..00000000000 --- a/doc/tutorials/convert_personal_namespace_into_group.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -redirect_to: 'convert_personal_namespace_to_group/index.md' -remove_date: '2023-07-21' ---- - -This document was moved to [another location](convert_personal_namespace_to_group/index.md). - -<!-- This redirect file can be deleted after 2023-07-21. --> -<!-- Redirects that point to other docs in the same project expire in three months. --> -<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. --> -<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->
\ No newline at end of file diff --git a/doc/tutorials/create_compliance_pipeline.md b/doc/tutorials/create_compliance_pipeline.md deleted file mode 100644 index ac5550ad6a4..00000000000 --- a/doc/tutorials/create_compliance_pipeline.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -redirect_to: 'compliance_pipeline/index.md' -remove_date: '2023-07-21' ---- - -This document was moved to [another location](compliance_pipeline/index.md). - -<!-- This redirect file can be deleted after 2023-07-21. --> -<!-- Redirects that point to other docs in the same project expire in three months. --> -<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. --> -<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->
\ No newline at end of file diff --git a/doc/tutorials/fuzz_testing_tutorial.md b/doc/tutorials/fuzz_testing_tutorial.md deleted file mode 100644 index 74b24005077..00000000000 --- a/doc/tutorials/fuzz_testing_tutorial.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -redirect_to: 'fuzz_testing/index.md' -remove_date: '2023-07-21' ---- - -This document was moved to [another location](fuzz_testing/index.md). - -<!-- This redirect file can be deleted after 2023-07-21. --> -<!-- Redirects that point to other docs in the same project expire in three months. --> -<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. --> -<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->
\ No newline at end of file diff --git a/doc/tutorials/make_your_first_git_commit.md b/doc/tutorials/make_your_first_git_commit.md deleted file mode 100644 index 04c66a953af..00000000000 --- a/doc/tutorials/make_your_first_git_commit.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -redirect_to: 'make_first_git_commit/index.md' -remove_date: '2023-07-21' ---- - -This document was moved to [another location](make_first_git_commit/index.md). - -<!-- This redirect file can be deleted after 2023-07-21. --> -<!-- Redirects that point to other docs in the same project expire in three months. --> -<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. --> -<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->
\ No newline at end of file diff --git a/doc/tutorials/move_personal_project_to_a_group.md b/doc/tutorials/move_personal_project_to_a_group.md deleted file mode 100644 index 361181fdde6..00000000000 --- a/doc/tutorials/move_personal_project_to_a_group.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -redirect_to: 'move_personal_project_to_group/index.md' -remove_date: '2023-07-21' ---- - -This document was moved to [another location](move_personal_project_to_group/index.md). - -<!-- This redirect file can be deleted after 2023-07-21. --> -<!-- Redirects that point to other docs in the same project expire in three months. --> -<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. --> -<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->
\ No newline at end of file diff --git a/doc/tutorials/scan_result_policy.md b/doc/tutorials/scan_result_policy.md deleted file mode 100644 index 9aacd8eff7b..00000000000 --- a/doc/tutorials/scan_result_policy.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -redirect_to: 'scan_result_policy/index.md' -remove_date: '2023-07-21' ---- - -This document was moved to [another location](scan_result_policy/index.md). - -<!-- This redirect file can be deleted after 2023-07-21. --> -<!-- Redirects that point to other docs in the same project expire in three months. --> -<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. --> -<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->
\ No newline at end of file diff --git a/doc/user/analytics/dora_metrics.md b/doc/user/analytics/dora_metrics.md index 120142aacee..6e06f7abcac 100644 --- a/doc/user/analytics/dora_metrics.md +++ b/doc/user/analytics/dora_metrics.md @@ -133,7 +133,7 @@ The DORA metrics are displayed on the following charts: - [Value Streams Dashboard](value_streams_dashboard.md), which helps you identify trends, patterns, and opportunities for improvement. DORA metrics are displayed in the [metrics comparison panel](value_streams_dashboard.md#devsecops-metrics-comparison-panel) and the [DORA Performers score panel](value_streams_dashboard.md#dora-performers-score-panel). - [CI/CD analytics charts](ci_cd_analytics.md), which show pipeline success rates and duration, and the history of DORA metrics over time. -- Insights reports for [groups](../group/insights/index.md) and [projects](value_stream_analytics.md), where you can also use [DORA query parameters](../../user/project/insights/index.md#dora-query-parameters) to create custom charts. +- Insights reports for [groups](../group/insights/index.md) and [projects](../group/value_stream_analytics/index.md), where you can also use [DORA query parameters](../../user/project/insights/index.md#dora-query-parameters) to create custom charts. The table below provides an overview of the DORA metrics' data aggregation in different charts. diff --git a/doc/user/analytics/index.md b/doc/user/analytics/index.md index 67714718db5..fd9f96757c3 100644 --- a/doc/user/analytics/index.md +++ b/doc/user/analytics/index.md @@ -27,7 +27,7 @@ GitLab provides several analytics features at the group level. Some of these fea - [Issue](../group/issues_analytics/index.md) - [Productivity](productivity_analytics.md) - [Repositories](../group/repositories_analytics/index.md) -- [Value Stream Management Analytics](value_stream_analytics.md), and [Value Stream Management Dashboard](value_streams_dashboard.md) +- [Value Stream Management Analytics](../group/value_stream_analytics/index.md), and [Value Stream Management Dashboard](value_streams_dashboard.md) ## Project-level analytics @@ -44,7 +44,7 @@ You can use GitLab to review analytics at the project level. Some of these featu - [Merge Request](merge_request_analytics.md), enabled with the `project_merge_request_analytics` [feature flag](../../development/feature_flags/index.md#enabling-a-feature-flag-locally-in-development) - [Repository](repository_analytics.md) -- [Value Stream Management Analytics](value_stream_analytics.md), and [Value Stream Management Dashboard](value_streams_dashboard.md) +- [Value Stream Management Analytics](../group/value_stream_analytics/index.md), and [Value Stream Management Dashboard](value_streams_dashboard.md) ### Remove project analytics from the left sidebar @@ -68,8 +68,7 @@ Be sure to review the documentation page for this feature for GitLab tier requir You can use the following analytics features to analyze and visualize the performance of your projects and groups: -- [Value stream analytics for projects](value_stream_analytics.md) -- [Value stream analytics for groups](../group/value_stream_analytics/index.md) +- [Value stream analytics for projects and groups](../group/value_stream_analytics/index.md) - [Value streams dashboard](value_streams_dashboard.md) ## Glossary diff --git a/doc/user/analytics/value_stream_analytics.md b/doc/user/analytics/value_stream_analytics.md deleted file mode 100644 index 292a6f430d9..00000000000 --- a/doc/user/analytics/value_stream_analytics.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -remove_date: '2023-07-22' -redirect_to: '../group/value_stream_analytics/index.md' ---- - -# Value stream analytics for projects **(FREE)** - -This document was moved to [another location](../group/value_stream_analytics/index.md). - -<!-- This redirect file can be deleted after 2023-07-22. --> -<!-- Redirects that point to other docs in the same project expire in three months. --> -<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. --> -<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html --> diff --git a/doc/user/application_security/secret_detection/post_processing.md b/doc/user/application_security/secret_detection/post_processing.md deleted file mode 100644 index 3a6cf7f7e37..00000000000 --- a/doc/user/application_security/secret_detection/post_processing.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -redirect_to: 'automatic_response.md' -remove_date: '2023-08-08' ---- - -This document was moved to [another location](automatic_response.md). - -<!-- This redirect file can be deleted after 2023-08-08. --> -<!-- Redirects that point to other docs in the same project expire in three months. --> -<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. --> -<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html --> diff --git a/doc/user/compliance/license_check_rules.md b/doc/user/compliance/license_check_rules.md deleted file mode 100644 index 3007d04a8c1..00000000000 --- a/doc/user/compliance/license_check_rules.md +++ /dev/null @@ -1,15 +0,0 @@ ---- -redirect_to: 'license_approval_policies.md' -remove_date: '2023-07-25' ---- - -# License Check Policies (removed) **(ULTIMATE)** - -This feature was [deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/390417) in GitLab 15.9 -and [removed](https://gitlab.com/gitlab-org/gitlab/-/issues/397067) in 16.0. -Use [License Approval Policies](license_approval_policies.md) instead. - -<!-- This redirect file can be deleted after <2023-07-25>. --> -<!-- Redirects that point to other docs in the same project expire in three months. --> -<!-- Redirects that point to docs in a different project or site (link is not relative and starts with `https:`) expire in one year. --> -<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html --> diff --git a/doc/user/packages/gradle_repository/index.md b/doc/user/packages/gradle_repository/index.md deleted file mode 100644 index 456acc0da59..00000000000 --- a/doc/user/packages/gradle_repository/index.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -redirect_to: '../maven_repository/index.md' -remove_date: '2023-08-09' ---- - -This document was moved to [another location](../maven_repository/index.md). - -<!-- This redirect file can be deleted after <2023-08-09>. --> -<!-- Redirects that point to other docs in the same project expire in three months. --> -<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. --> -<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html --> diff --git a/doc/user/project/code_owners.md b/doc/user/project/code_owners.md deleted file mode 100644 index f9244177aa5..00000000000 --- a/doc/user/project/code_owners.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -redirect_to: 'codeowners/index.md' -remove_date: '2023-07-07' ---- - -This document was moved to [another location](codeowners/index.md). - -<!-- This redirect file can be deleted after <2023-07-07>. --> -<!-- Redirects that point to other docs in the same project expire in three months. --> -<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. --> -<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html --> diff --git a/doc/user/project/issues/design_management.md b/doc/user/project/issues/design_management.md index 6013abc4892..ea5e3f20b3a 100644 --- a/doc/user/project/issues/design_management.md +++ b/doc/user/project/issues/design_management.md @@ -44,7 +44,7 @@ For a video overview, see [Design Management (GitLab 12.2)](https://www.youtube. A GitLab administrator can verify the storage type of a project by going to **Admin Area > Projects** and then selecting the project in question. A project can be identified as - hashed-stored if its **Gitaly relative path** contains `@hashed`. + hashed-stored if the value of the **Relative path** field contains `@hashed`. If the requirements are not met, you are notified in the **Designs** section. diff --git a/doc/user/project/merge_requests/changes.md b/doc/user/project/merge_requests/changes.md index 9b0ab278cb2..7292f3d3443 100644 --- a/doc/user/project/merge_requests/changes.md +++ b/doc/user/project/merge_requests/changes.md @@ -16,6 +16,10 @@ to the files in the target branch, and shows only the parts of a file that have ![Example screenshot of a source code diff](img/mr-diff-example_v15.png) +For technical details on how GitLab calculates the diff between the two revisions, +read [Working with diffs](../../../development/merge_request_concepts/diffs/index.md) +in our development documentation. + ## Show all changes in a merge request To view the diff of changes included in a merge request: |