diff --git a/app/assets/javascripts/artifacts/components/artifact_row.vue b/app/assets/javascripts/artifacts/components/artifact_row.vue
index 92044a3641a..b6cea6a04e3 100644
--- a/app/assets/javascripts/artifacts/components/artifact_row.vue
+++ b/app/assets/javascripts/artifacts/components/artifact_row.vue
@@ -1,5 +1,5 @@
 <script>
-import { GlButtonGroup, GlButton, GlBadge } from '@gitlab/ui';
+import { GlButtonGroup, GlButton, GlBadge, GlFriendlyWrap } from '@gitlab/ui';
 import { numberToHumanSize } from '~/lib/utils/number_utils';
 import { I18N_EXPIRED, I18N_DOWNLOAD, I18N_DELETE } from '../constants';
 
@@ -9,6 +9,7 @@ export default {
     GlButtonGroup,
     GlButton,
     GlBadge,
+    GlFriendlyWrap,
   },
   props: {
     artifact: {
@@ -48,8 +49,11 @@ export default {
     :class="{ 'gl-border-b-solid gl-border-b-1 gl-border-gray-100': !isLastRow }"
   >
     <div class="gl-display-inline-flex gl-align-items-center gl-w-full">
-      <span class="gl-w-half gl-pl-8 gl-display-flex" data-testid="job-artifact-row-name">
-        {{ artifact.name }}
+      <span
+        class="gl-w-half gl-pl-8 gl-display-flex gl-align-items-center"
+        data-testid="job-artifact-row-name"
+      >
+        <gl-friendly-wrap :text="artifact.name" />
         <gl-badge size="sm" variant="neutral" class="gl-ml-2">
           {{ artifact.fileType.toLowerCase() }}
         </gl-badge>
diff --git a/db/docs/approval_merge_request_rule_sources.yml b/db/docs/approval_merge_request_rule_sources.yml
index c1b4da16a1e..868d694d190 100644
--- a/db/docs/approval_merge_request_rule_sources.yml
+++ b/db/docs/approval_merge_request_rule_sources.yml
@@ -4,6 +4,6 @@ classes:
 - ApprovalMergeRequestRuleSource
 feature_categories:
 - source_code_management
-description: TODO
+description: Keeps connection between merge request and project approval rule
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/8497
 milestone: '11.7'
diff --git a/db/docs/approval_merge_request_rules.yml b/db/docs/approval_merge_request_rules.yml
index 2db3de519db..ad8b3411706 100644
--- a/db/docs/approval_merge_request_rules.yml
+++ b/db/docs/approval_merge_request_rules.yml
@@ -4,6 +4,6 @@ classes:
 - ApprovalMergeRequestRule
 feature_categories:
 - source_code_management
-description: TODO
+description: Keeps approval merge request rules
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/8497
 milestone: '11.7'
diff --git a/db/docs/approval_merge_request_rules_groups.yml b/db/docs/approval_merge_request_rules_groups.yml
index 86aa93fa179..1acf9882d57 100644
--- a/db/docs/approval_merge_request_rules_groups.yml
+++ b/db/docs/approval_merge_request_rules_groups.yml
@@ -3,6 +3,6 @@ table_name: approval_merge_request_rules_groups
 classes: []
 feature_categories:
 - source_code_management
-description: TODO
+description: Keeps connection between group and a merge request approval rule
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/8497
 milestone: '11.7'
diff --git a/db/docs/approval_merge_request_rules_users.yml b/db/docs/approval_merge_request_rules_users.yml
index 710de6cc0c4..750e7ae1f48 100644
--- a/db/docs/approval_merge_request_rules_users.yml
+++ b/db/docs/approval_merge_request_rules_users.yml
@@ -3,6 +3,6 @@ table_name: approval_merge_request_rules_users
 classes: []
 feature_categories:
 - source_code_management
-description: TODO
+description: Keeps connection between user and a merge request approval rule
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/8497
 milestone: '11.7'
diff --git a/db/docs/approval_project_rules.yml b/db/docs/approval_project_rules.yml
index a2a9eeb823f..c2aff9d358f 100644
--- a/db/docs/approval_project_rules.yml
+++ b/db/docs/approval_project_rules.yml
@@ -4,6 +4,6 @@ classes:
 - ApprovalProjectRule
 feature_categories:
 - source_code_management
-description: TODO
+description: Keeps approval project rules
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/8497
 milestone: '11.7'
diff --git a/db/docs/approval_project_rules_groups.yml b/db/docs/approval_project_rules_groups.yml
index 11ed75a398b..83eeb52099c 100644
--- a/db/docs/approval_project_rules_groups.yml
+++ b/db/docs/approval_project_rules_groups.yml
@@ -3,6 +3,6 @@ table_name: approval_project_rules_groups
 classes: []
 feature_categories:
 - source_code_management
-description: TODO
+description: Keeps connection between group and a project approval rule
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/8497
 milestone: '11.7'
diff --git a/db/docs/approval_project_rules_protected_branches.yml b/db/docs/approval_project_rules_protected_branches.yml
index 197644b75db..a41fd741af8 100644
--- a/db/docs/approval_project_rules_protected_branches.yml
+++ b/db/docs/approval_project_rules_protected_branches.yml
@@ -4,6 +4,6 @@ classes:
 - ApprovalProjectRulesProtectedBranch
 feature_categories:
 - source_code_management
-description: TODO
+description: Keeps relation between approval project rules and protected branches.
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/22673
 milestone: '12.7'
diff --git a/db/docs/approval_project_rules_users.yml b/db/docs/approval_project_rules_users.yml
index 8fe1c5c7f71..a1ff8bf7bff 100644
--- a/db/docs/approval_project_rules_users.yml
+++ b/db/docs/approval_project_rules_users.yml
@@ -3,6 +3,6 @@ table_name: approval_project_rules_users
 classes: []
 feature_categories:
 - source_code_management
-description: TODO
+description: Keeps connection between user and a project approval rule
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/8497
 milestone: '11.7'
diff --git a/db/docs/approvals.yml b/db/docs/approvals.yml
index e26a2ca4aa4..82d833b9ba6 100644
--- a/db/docs/approvals.yml
+++ b/db/docs/approvals.yml
@@ -4,6 +4,6 @@ classes:
 - Approval
 feature_categories:
 - source_code_management
-description: TODO
+description: Stores merge request approvals made by users
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/73faf3c7289c4fa4535b752a12247ee74b173976
 milestone: '7.12'
diff --git a/db/docs/approver_groups.yml b/db/docs/approver_groups.yml
index 6f0be968f07..e078e20814c 100644
--- a/db/docs/approver_groups.yml
+++ b/db/docs/approver_groups.yml
@@ -3,7 +3,8 @@ table_name: approver_groups
 classes:
 - ApproverGroup
 feature_categories:
+- code_review
 - source_code_management
-description: TODO
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/21d27185191e6204a6645d776c77ae3855cce3e8
+description: Group approvers of given merge request
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/743
 milestone: '8.13'
diff --git a/db/docs/approvers.yml b/db/docs/approvers.yml
index 86fc663be93..f0bfa47761a 100644
--- a/db/docs/approvers.yml
+++ b/db/docs/approvers.yml
@@ -4,6 +4,7 @@ classes:
 - Approver
 feature_categories:
 - code_review
+- source_code_management
 description: Approvers of given merge request
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/3cc78d89984d9c9df8372c52b7bba38e6226f9f2
 milestone: '7.13'
diff --git a/db/docs/ci_build_report_results.yml b/db/docs/ci_build_report_results.yml
index 42d152221f3..b1f112aea3c 100644
--- a/db/docs/ci_build_report_results.yml
+++ b/db/docs/ci_build_report_results.yml
@@ -4,6 +4,6 @@ classes:
 - Ci::BuildReportResult
 feature_categories:
 - code_testing
-description: TODO
+description: Stores data related to the build that finished, including junit test data.
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/32991
 milestone: '13.1'
diff --git a/db/docs/ci_daily_build_group_report_results.yml b/db/docs/ci_daily_build_group_report_results.yml
index 8f23ac42bd0..3e75950f462 100644
--- a/db/docs/ci_daily_build_group_report_results.yml
+++ b/db/docs/ci_daily_build_group_report_results.yml
@@ -4,6 +4,6 @@ classes:
 - Ci::DailyBuildGroupReportResult
 feature_categories:
 - code_testing
-description: TODO
+description: Stores daily aggregated data related to the build group, including code coverage data.
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/30387
 milestone: '13.0'
diff --git a/db/docs/ci_deleted_objects.yml b/db/docs/ci_deleted_objects.yml
index 24d19069913..a2e108e6c0a 100644
--- a/db/docs/ci_deleted_objects.yml
+++ b/db/docs/ci_deleted_objects.yml
@@ -4,6 +4,6 @@ classes:
 - Ci::DeletedObject
 feature_categories:
 - build_artifacts
-description: TODO
+description: Allows efficient batch deletion of data in object storage.
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/9bf76fe03f8edf4f67023448161af27abb8fb521
 milestone: '13.5'
diff --git a/db/docs/ci_job_artifacts.yml b/db/docs/ci_job_artifacts.yml
index 781ba3babf1..492132315b6 100644
--- a/db/docs/ci_job_artifacts.yml
+++ b/db/docs/ci_job_artifacts.yml
@@ -5,6 +5,6 @@ classes:
 - Gitlab::Ci::JobArtifact
 feature_categories:
 - build_artifacts
-description: TODO
+description: Stores artifacts produced by a build.
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/61864a5a5bb523953589c9398a431c4369fbfc76
 milestone: '10.3'
diff --git a/db/docs/ci_pipeline_artifacts.yml b/db/docs/ci_pipeline_artifacts.yml
index 753a57c74e2..124fe4de90b 100644
--- a/db/docs/ci_pipeline_artifacts.yml
+++ b/db/docs/ci_pipeline_artifacts.yml
@@ -4,6 +4,6 @@ classes:
 - Ci::PipelineArtifact
 feature_categories:
 - build_artifacts
-description: TODO
+description: Stores aggregated artifacts produced by a pipeline.
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/37969
 milestone: '13.3'
diff --git a/db/docs/ci_unit_test_failures.yml b/db/docs/ci_unit_test_failures.yml
index 14f66f5c586..9a1b27e8062 100644
--- a/db/docs/ci_unit_test_failures.yml
+++ b/db/docs/ci_unit_test_failures.yml
@@ -4,6 +4,6 @@ classes:
 - Ci::UnitTestFailure
 feature_categories:
 - code_testing
-description: TODO
+description: Stores unit test failure data produced from builds.
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56137
 milestone: '13.11'
diff --git a/db/docs/ci_unit_tests.yml b/db/docs/ci_unit_tests.yml
index c22ad567c12..46b405678f0 100644
--- a/db/docs/ci_unit_tests.yml
+++ b/db/docs/ci_unit_tests.yml
@@ -4,6 +4,6 @@ classes:
 - Ci::UnitTest
 feature_categories:
 - code_testing
-description: TODO
+description: Stores unit test data produced from builds.
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56137
 milestone: '13.11'
diff --git a/db/docs/content_blocked_states.yml b/db/docs/content_blocked_states.yml
index c2c4118b534..0abf239a98b 100644
--- a/db/docs/content_blocked_states.yml
+++ b/db/docs/content_blocked_states.yml
@@ -3,6 +3,6 @@ table_name: content_blocked_states
 classes: []
 feature_categories:
 - source_code_management
-description: TODO
+description: JiHu only. Keeps list of restricted blobs.
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/72124
 milestone: '14.5'
diff --git a/db/docs/diff_note_positions.yml b/db/docs/diff_note_positions.yml
index 8e8a64861ab..0c4f688b4d4 100644
--- a/db/docs/diff_note_positions.yml
+++ b/db/docs/diff_note_positions.yml
@@ -4,6 +4,6 @@ classes:
 - DiffNotePosition
 feature_categories:
 - source_code_management
-description: TODO
+description: Stores diff notes positions
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/28113
 milestone: '13.0'
diff --git a/db/docs/external_approval_rules_protected_branches.yml b/db/docs/external_approval_rules_protected_branches.yml
index ca498fe82ca..de4e1af7214 100644
--- a/db/docs/external_approval_rules_protected_branches.yml
+++ b/db/docs/external_approval_rules_protected_branches.yml
@@ -2,7 +2,7 @@
 table_name: external_approval_rules_protected_branches
 classes: []
 feature_categories:
-- source_code_management
-description: TODO
+- compliance_management
+description: Keeps relation between protected branches and external approval rules
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54002
 milestone: '13.10'
diff --git a/db/docs/external_status_checks.yml b/db/docs/external_status_checks.yml
index fd9fe357173..1bb1bc03224 100644
--- a/db/docs/external_status_checks.yml
+++ b/db/docs/external_status_checks.yml
@@ -3,7 +3,7 @@ table_name: external_status_checks
 classes:
 - MergeRequests::ExternalStatusCheck
 feature_categories:
-- source_code_management
-description: TODO
+- compliance_management
+description: Stores project's external status checks
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/62186
 milestone: '14.0'
diff --git a/db/docs/external_status_checks_protected_branches.yml b/db/docs/external_status_checks_protected_branches.yml
index 34f4edabb5d..bf26689bd0b 100644
--- a/db/docs/external_status_checks_protected_branches.yml
+++ b/db/docs/external_status_checks_protected_branches.yml
@@ -2,7 +2,7 @@
 table_name: external_status_checks_protected_branches
 classes: []
 feature_categories:
-- source_code_management
-description: TODO
+- compliance_management
+description: Keeps relation between protected branches and external status checks
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/62186
 milestone: '14.0'
diff --git a/db/docs/fork_network_members.yml b/db/docs/fork_network_members.yml
index 47f6150a147..2077977f1b7 100644
--- a/db/docs/fork_network_members.yml
+++ b/db/docs/fork_network_members.yml
@@ -4,6 +4,6 @@ classes:
 - ForkNetworkMember
 feature_categories:
 - source_code_management
-description: TODO
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/3098
+description: Keeps track of fork relations between projects.
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/62186
 milestone: '10.1'
diff --git a/db/docs/gpg_key_subkeys.yml b/db/docs/gpg_key_subkeys.yml
index 828ee6dac70..b3824c36e81 100644
--- a/db/docs/gpg_key_subkeys.yml
+++ b/db/docs/gpg_key_subkeys.yml
@@ -4,6 +4,6 @@ classes:
 - GpgKeySubkey
 feature_categories:
 - source_code_management
-description: TODO
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/3098
+description: Stores GPG subkeys
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/14517
 milestone: '10.1'
diff --git a/db/docs/gpg_keys.yml b/db/docs/gpg_keys.yml
index d4524e777ee..00b76959fe4 100644
--- a/db/docs/gpg_keys.yml
+++ b/db/docs/gpg_keys.yml
@@ -4,6 +4,6 @@ classes:
 - GpgKey
 feature_categories:
 - source_code_management
-description: TODO
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/fbf1fd1a204a24aef2b80473ec64a520ed2a2dfc
+description: Stores GPG keys
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/9546
 milestone: '9.5'
diff --git a/db/docs/gpg_signatures.yml b/db/docs/gpg_signatures.yml
index a0f79655270..f49a0c03844 100644
--- a/db/docs/gpg_signatures.yml
+++ b/db/docs/gpg_signatures.yml
@@ -4,6 +4,6 @@ classes:
 - CommitSignatures::GpgSignature
 feature_categories:
 - source_code_management
-description: TODO
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/8236b12dff3df6d223888664c820ae54b4e0eaf7
+description: Stores GPG signatures
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/9546
 milestone: '9.5'
diff --git a/db/docs/group_merge_request_approval_settings.yml b/db/docs/group_merge_request_approval_settings.yml
index 70a2ef9311b..33bb2370a86 100644
--- a/db/docs/group_merge_request_approval_settings.yml
+++ b/db/docs/group_merge_request_approval_settings.yml
@@ -4,6 +4,6 @@ classes:
 - GroupMergeRequestApprovalSetting
 feature_categories:
 - source_code_management
-description: TODO
+description: Keeps merge request approval settings per group
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/50256
 milestone: '13.8'
diff --git a/db/docs/merge_request_blocks.yml b/db/docs/merge_request_blocks.yml
index 992fd88c1e5..1a3452fc66c 100644
--- a/db/docs/merge_request_blocks.yml
+++ b/db/docs/merge_request_blocks.yml
@@ -4,6 +4,6 @@ classes:
 - MergeRequestBlock
 feature_categories:
 - source_code_management
-description: TODO
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/df778038981ae49cb7c0fec0a60f89abf801c5f0
-milestone: '12.0'
+description: Keeps relation between blocked and blocking merge requests
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/27323
+milestone: '11.11'
diff --git a/db/docs/merge_request_context_commit_diff_files.yml b/db/docs/merge_request_context_commit_diff_files.yml
index 08311e244a1..08af5c387c4 100644
--- a/db/docs/merge_request_context_commit_diff_files.yml
+++ b/db/docs/merge_request_context_commit_diff_files.yml
@@ -3,7 +3,7 @@ table_name: merge_request_context_commit_diff_files
 classes:
 - MergeRequestContextCommitDiffFile
 feature_categories:
-- source_code_management
-description: TODO
+- code_review
+description: Stores diffs data for merge request context commits
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/23701
 milestone: '12.8'
diff --git a/db/docs/namespace_aggregation_schedules.yml b/db/docs/namespace_aggregation_schedules.yml
index 517a65000eb..07c80396302 100644
--- a/db/docs/namespace_aggregation_schedules.yml
+++ b/db/docs/namespace_aggregation_schedules.yml
@@ -3,7 +3,7 @@ table_name: namespace_aggregation_schedules
 classes:
 - Namespace::AggregationSchedule
 feature_categories:
-- source_code_management
-description: TODO
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/bde41ee866d0fe0b1bb5ece1130fb6e24d95ad17
+- utilization
+description: Keeps update schedules for namespace_root_storage_statistics
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/29570
 milestone: '12.1'
diff --git a/db/docs/path_locks.yml b/db/docs/path_locks.yml
index 0a6e3390035..27548f44c39 100644
--- a/db/docs/path_locks.yml
+++ b/db/docs/path_locks.yml
@@ -4,6 +4,6 @@ classes:
 - PathLock
 feature_categories:
 - source_code_management
-description: TODO
+description: Stores paths to repository blobs locked by users
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/684e9d1b5979e11d2edae11a3028a696bfcdedf8
 milestone: '8.9'
diff --git a/db/docs/project_aliases.yml b/db/docs/project_aliases.yml
index 66dead7706a..f79c81d2afe 100644
--- a/db/docs/project_aliases.yml
+++ b/db/docs/project_aliases.yml
@@ -4,6 +4,6 @@ classes:
 - ProjectAlias
 feature_categories:
 - source_code_management
-description: TODO
+description: Stores aliases of projects
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/14108
 milestone: '12.1'
diff --git a/db/docs/project_build_artifacts_size_refreshes.yml b/db/docs/project_build_artifacts_size_refreshes.yml
index 8f07ab9b3e1..56bad0e4df6 100644
--- a/db/docs/project_build_artifacts_size_refreshes.yml
+++ b/db/docs/project_build_artifacts_size_refreshes.yml
@@ -4,6 +4,6 @@ classes:
 - Projects::BuildArtifactsSizeRefresh
 feature_categories:
 - build_artifacts
-description: TODO
+description: Temporary table to accurately recompute artifacts size.
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81306
 milestone: '14.9'
diff --git a/db/docs/project_ci_feature_usages.yml b/db/docs/project_ci_feature_usages.yml
index af9404570df..e7e354c6cc7 100644
--- a/db/docs/project_ci_feature_usages.yml
+++ b/db/docs/project_ci_feature_usages.yml
@@ -4,6 +4,6 @@ classes:
 - Projects::CiFeatureUsage
 feature_categories:
 - code_testing
-description: Project CI feature usage information
+description: Project CI feature usage information used to access CI data from the main database.
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68186
 milestone: '14.2'
diff --git a/db/docs/project_daily_statistics.yml b/db/docs/project_daily_statistics.yml
index cddde444296..5de94c2845b 100644
--- a/db/docs/project_daily_statistics.yml
+++ b/db/docs/project_daily_statistics.yml
@@ -4,6 +4,6 @@ classes:
 - ProjectDailyStatistic
 feature_categories:
 - source_code_management
-description: TODO
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/5ae9a44aa17c8929627cc450f936cd960c143e25
+description: Stores repository fetch statistics per day
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/23596
 milestone: '11.9'
diff --git a/db/docs/project_repositories.yml b/db/docs/project_repositories.yml
index cd0d7a6c1d7..ed90a0d1595 100644
--- a/db/docs/project_repositories.yml
+++ b/db/docs/project_repositories.yml
@@ -4,6 +4,6 @@ classes:
 - ProjectRepository
 feature_categories:
 - source_code_management
-description: TODO
+description: Keeps disk path to repositories and link to the shard
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/8614
 milestone: '11.6'
diff --git a/db/docs/project_repository_states.yml b/db/docs/project_repository_states.yml
index 343ae980a88..fa762a646f4 100644
--- a/db/docs/project_repository_states.yml
+++ b/db/docs/project_repository_states.yml
@@ -3,7 +3,7 @@ table_name: project_repository_states
 classes:
 - ProjectRepositoryState
 feature_categories:
-- source_code_management
-description: TODO
+- geo_replication
+description: Keeps checksums of repositories
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/4428
 milestone: '10.6'
diff --git a/db/docs/project_repository_storage_moves.yml b/db/docs/project_repository_storage_moves.yml
index 12fa9d33f07..4255a0d4a8a 100644
--- a/db/docs/project_repository_storage_moves.yml
+++ b/db/docs/project_repository_storage_moves.yml
@@ -3,7 +3,7 @@ table_name: project_repository_storage_moves
 classes:
 - Projects::RepositoryStorageMove
 feature_categories:
-- source_code_management
-description: TODO
+- gitaly
+description: Stores status of project repository moves
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/29095
 milestone: '13.0'
diff --git a/db/docs/protected_branch_merge_access_levels.yml b/db/docs/protected_branch_merge_access_levels.yml
index 953d05f8eec..a07303975ad 100644
--- a/db/docs/protected_branch_merge_access_levels.yml
+++ b/db/docs/protected_branch_merge_access_levels.yml
@@ -4,6 +4,6 @@ classes:
 - ProtectedBranch::MergeAccessLevel
 feature_categories:
 - source_code_management
-description: TODO
+description: Stores merge access settings for protected branches
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/5081
 milestone: '8.11'
diff --git a/db/docs/protected_branch_push_access_levels.yml b/db/docs/protected_branch_push_access_levels.yml
index 58010735b0f..fff94bceace 100644
--- a/db/docs/protected_branch_push_access_levels.yml
+++ b/db/docs/protected_branch_push_access_levels.yml
@@ -4,6 +4,6 @@ classes:
 - ProtectedBranch::PushAccessLevel
 feature_categories:
 - source_code_management
-description: TODO
+description: Stores push access settings for protected branches
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/5081
 milestone: '8.11'
diff --git a/db/docs/protected_branch_unprotect_access_levels.yml b/db/docs/protected_branch_unprotect_access_levels.yml
index 635cf646df2..8727d77e8ec 100644
--- a/db/docs/protected_branch_unprotect_access_levels.yml
+++ b/db/docs/protected_branch_unprotect_access_levels.yml
@@ -4,6 +4,6 @@ classes:
 - ProtectedBranch::UnprotectAccessLevel
 feature_categories:
 - source_code_management
-description: TODO
+description: Stores access settings for protected branch unprotection
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/5103
 milestone: '10.7'
diff --git a/db/docs/protected_branches.yml b/db/docs/protected_branches.yml
index d1851c7cde6..a94c7d7681c 100644
--- a/db/docs/protected_branches.yml
+++ b/db/docs/protected_branches.yml
@@ -5,6 +5,6 @@ classes:
 - ProtectedBranch
 feature_categories:
 - source_code_management
-description: TODO
+description: Keeps a list of protected branches by project
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/37224dc9c1ee80ba9030b616e2bc87bd96919e09
 milestone: "<6.0"
diff --git a/db/docs/protected_tag_create_access_levels.yml b/db/docs/protected_tag_create_access_levels.yml
index 9856b1a0f25..0c1ae808e67 100644
--- a/db/docs/protected_tag_create_access_levels.yml
+++ b/db/docs/protected_tag_create_access_levels.yml
@@ -4,6 +4,6 @@ classes:
 - ProtectedTag::CreateAccessLevel
 feature_categories:
 - source_code_management
-description: TODO
+description: Stores create access settings for protected tags
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/07d7d8e65905a39164b63f55eccdcea8f10f5d14
 milestone: '9.1'
diff --git a/db/docs/protected_tags.yml b/db/docs/protected_tags.yml
index 0a18451d592..79b0b51de5f 100644
--- a/db/docs/protected_tags.yml
+++ b/db/docs/protected_tags.yml
@@ -4,6 +4,6 @@ classes:
 - ProtectedTag
 feature_categories:
 - source_code_management
-description: TODO
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/1a416a42f1c1b876ecd96687e41696bc915cc2c2
+description: Keeps a list of protected tags by project
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/10356
 milestone: '9.1'
diff --git a/db/docs/push_event_payloads.yml b/db/docs/push_event_payloads.yml
index ea40e5270f4..68cd4ae4bb8 100644
--- a/db/docs/push_event_payloads.yml
+++ b/db/docs/push_event_payloads.yml
@@ -3,7 +3,7 @@ table_name: push_event_payloads
 classes:
 - PushEventPayload
 feature_categories:
-- source_code_management
-description: TODO
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/0395c47193b3bbf6b4f060f28c9f632580313a35
+- users
+description: Stores log of push events
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/12463
 milestone: '9.5'
diff --git a/db/docs/remote_mirrors.yml b/db/docs/remote_mirrors.yml
index 6926e0d2633..5d38c9cc3ec 100644
--- a/db/docs/remote_mirrors.yml
+++ b/db/docs/remote_mirrors.yml
@@ -4,6 +4,6 @@ classes:
 - RemoteMirror
 feature_categories:
 - source_code_management
-description: TODO
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/ab83917c25c5d1f7dd29c82c91c699008292bc1d
+description: Stores push mirrors and their update statuses
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/249
 milestone: '8.7'
diff --git a/db/docs/repository_languages.yml b/db/docs/repository_languages.yml
index b38afde69a0..ceee8670a68 100644
--- a/db/docs/repository_languages.yml
+++ b/db/docs/repository_languages.yml
@@ -4,6 +4,6 @@ classes:
 - RepositoryLanguage
 feature_categories:
 - source_code_management
-description: TODO
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/79a5d76801a45696db629e1f543f2e1d6fa4784f
+description: Keeps relation between projects and repository languages
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/19480
 milestone: '11.2'
diff --git a/db/docs/required_code_owners_sections.yml b/db/docs/required_code_owners_sections.yml
index a8018193d30..059078cce27 100644
--- a/db/docs/required_code_owners_sections.yml
+++ b/db/docs/required_code_owners_sections.yml
@@ -4,6 +4,6 @@ classes:
 - ProtectedBranch::RequiredCodeOwnersSection
 feature_categories:
 - source_code_management
-description: TODO
+description: Keeps required code owners sections
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/43573
 milestone: '13.5'
diff --git a/db/docs/trending_projects.yml b/db/docs/trending_projects.yml
index 9dd23857da0..1ee72f2d244 100644
--- a/db/docs/trending_projects.yml
+++ b/db/docs/trending_projects.yml
@@ -4,6 +4,6 @@ classes:
 - TrendingProject
 feature_categories:
 - source_code_management
-description: TODO
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/237c8f66e6608420629503280aaea555ee980022
+description: Stores the list of trending projects
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/6749
 milestone: '8.13'
diff --git a/db/docs/x509_certificates.yml b/db/docs/x509_certificates.yml
index 26fc03c743d..bcf976155f4 100644
--- a/db/docs/x509_certificates.yml
+++ b/db/docs/x509_certificates.yml
@@ -4,6 +4,6 @@ classes:
 - X509Certificate
 feature_categories:
 - source_code_management
-description: TODO
+description: Stores data about X.509 certificate
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/17773
 milestone: '12.8'
diff --git a/db/docs/x509_commit_signatures.yml b/db/docs/x509_commit_signatures.yml
index 5791f6439d6..170294c8d56 100644
--- a/db/docs/x509_commit_signatures.yml
+++ b/db/docs/x509_commit_signatures.yml
@@ -4,6 +4,6 @@ classes:
 - CommitSignatures::X509CommitSignature
 feature_categories:
 - source_code_management
-description: TODO
+description: Stores X.509 verification status of the commit
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/17773
 milestone: '12.8'
diff --git a/db/docs/x509_issuers.yml b/db/docs/x509_issuers.yml
index 0165189f044..30bbe8e4b12 100644
--- a/db/docs/x509_issuers.yml
+++ b/db/docs/x509_issuers.yml
@@ -4,6 +4,6 @@ classes:
 - X509Issuer
 feature_categories:
 - source_code_management
-description: TODO
+description: Stores data about issuer of X.509 certificate
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/17773
 milestone: '12.8'
diff --git a/doc/administration/geo/replication/troubleshooting.md b/doc/administration/geo/replication/troubleshooting.md
index effc49d21ba..0931a551b23 100644
--- a/doc/administration/geo/replication/troubleshooting.md
+++ b/doc/administration/geo/replication/troubleshooting.md
@@ -317,7 +317,8 @@ sudo gitlab-rake gitlab:geo:check
 to gather the following, basic troubleshooting information.
 
 WARNING:
-Any command that changes data directly could be damaging if not run correctly, or under the right conditions. We highly recommend running them in a test environment with a backup of the instance ready to be restored, just in case.
+
+Commands that change data can cause damage if not run correctly or under the right conditions. Always run commands in a test environment first and have a backup instance ready to restore.
 
 #### Get the number of verification failed repositories
 
@@ -854,7 +855,8 @@ therefore short-circuited. `last_sync_failure` is now set to `The file is missin
 examples, but things generally work the same for the other types.
 
 WARNING:
-Any command that changes data directly could be damaging if not run correctly, or under the right conditions. We highly recommend running them in a test environment with a backup of the instance ready to be restored, just in case.
+
+Commands that change data can cause damage if not run correctly or under the right conditions. Always run commands in a test environment first and have a backup instance ready to restore.
 
 #### The Replicator
 
diff --git a/doc/administration/operations/rails_console.md b/doc/administration/operations/rails_console.md
index 70386cbbb94..f818d2d1a3c 100644
--- a/doc/administration/operations/rails_console.md
+++ b/doc/administration/operations/rails_console.md
@@ -736,7 +736,8 @@ ApplicationSetting.current
 ### Open object in `irb`
 
 WARNING:
-Any command that changes data directly could be damaging if not run correctly, or under the right conditions. We highly recommend running them in a test environment with a backup of the instance ready to be restored, just in case.
+
+Commands that change data can cause damage if not run correctly or under the right conditions. Always run commands in a test environment first and have a backup instance ready to restore.
 
 Sometimes it is easier to go through a method if you are in the context of the object. You can shim into the namespace of `Object` to let you open `irb` in the context of any object:
 
diff --git a/doc/api/deploy_tokens.md b/doc/api/deploy_tokens.md
index 5c4c99f3ba3..dff3ef05bb0 100644
--- a/doc/api/deploy_tokens.md
+++ b/doc/api/deploy_tokens.md
@@ -222,7 +222,7 @@ Parameters:
 
 | Attribute      | Type           | Required               | Description |
 |:---------------|:---------------|:-----------------------|:------------|
-| `id`           | integer/string | **{check-circle}** Yes | ID or [URL-encoded path of the project](index.md#namespaced-path-encoding). |
+| `id`           | integer/string | **{check-circle}** Yes | ID or [URL-encoded path of the group](index.md#namespaced-path-encoding). |
 | `active`       | boolean        | **{dotted-circle}** No | Limit by active status. |
 
 Example request:
diff --git a/doc/development/ee_features.md b/doc/development/ee_features.md
index 2516196d2e0..24d4aeeb87e 100644
--- a/doc/development/ee_features.md
+++ b/doc/development/ee_features.md
@@ -130,7 +130,7 @@ export GITLAB_SIMULATE_SAAS=1
 There are many ways to pass an environment variable to your local GitLab instance.
 For example, you can create a `env.runit` file in the root of your GDK with the above snippet.
 
-#### Allow use of licensed EE feature
+#### Enable plans per namespace
 
 To enable plans per namespace turn on the `Allow use of licensed EE features` option from the settings page.
 This will make licensed EE features available to projects only if the project namespace's plan includes the feature
diff --git a/doc/user/group/manage.md b/doc/user/group/manage.md
index a7f87404732..19620890253 100644
--- a/doc/user/group/manage.md
+++ b/doc/user/group/manage.md
@@ -816,7 +816,8 @@ Group.find_by_sql("SELECT * FROM namespaces WHERE name LIKE '%oup'")
 If transferring a group doesn't work through the UI or API, you may want to attempt the transfer in a [Rails console session](../../administration/operations/rails_console.md#starting-a-rails-console-session):
 
 WARNING:
-Any command that changes data directly could be damaging if not run correctly, or under the right conditions. We highly recommend running them in a test environment with a backup of the instance ready to be restored, just in case.
+
+Commands that change data can cause damage if not run correctly or under the right conditions. Always run commands in a test environment first and have a backup instance ready to restore.
 
 ```ruby
 user = User.find_by_username('<username>')
@@ -847,7 +848,8 @@ At times, a group deletion may get stuck. If needed, in a [Rails console session
 you can attempt to delete a group using the following command:
 
 WARNING:
-Any command that changes data directly could be damaging if not run correctly, or under the right conditions. We highly recommend running them in a test environment with a backup of the instance ready to be restored, just in case.
+
+Commands that change data can cause damage if not run correctly or under the right conditions. Always run commands in a test environment first and have a backup instance ready to restore.
 
 ```ruby
 GroupDestroyWorker.new.perform(group_id, user_id)
diff --git a/doc/user/packages/terraform_module_registry/index.md b/doc/user/packages/terraform_module_registry/index.md
index 52ca5983083..2b99ff807ec 100644
--- a/doc/user/packages/terraform_module_registry/index.md
+++ b/doc/user/packages/terraform_module_registry/index.md
@@ -24,9 +24,11 @@ When you publish a Terraform Module, if it does not exist, it is created.
 
 Prerequisites:
 
-- A package with the same name and version must not already exist in the top-level namespace.
+- The package name and version [must be unique in the top-level namespace](../infrastructure_registry/index.md#how-module-resolution-works).
 - Your project and group names must not include a dot (`.`). For example, `source = "gitlab.example.com/my.group/project.name"`.
 - You must [authenticate with the API](../../../api/index.md#authentication). If authenticating with a deploy token, it must be configured with the `write_package_registry` scope.
+- The name of a module [must be unique within the scope of its group](../infrastructure_registry/index.md#how-module-resolution-works), otherwise an
+  [error occurs](#troubleshooting).
 
 ```plaintext
 PUT /projects/:id/packages/terraform/modules/:module-name/:module-system/:module-version/file
@@ -141,3 +143,7 @@ For examples of the Terraform module registry, check the projects below:
 
 - The [_GitLab local file_ project](https://gitlab.com/mattkasa/gitlab-local-file) creates a minimal Terraform module and uploads it into the Terraform module registry using GitLab CI/CD.
 - The [_Terraform module test_ project](https://gitlab.com/mattkasa/terraform-module-test) uses the module from the previous example.
+
+## Troubleshooting
+
+- Publishing a module with a duplicate name results in a `{"message":"Access Denied"}` error. There's an ongoing discussion about allowing duplicate module names [in this issue](https://gitlab.com/gitlab-org/gitlab/-/issues/368040).
diff --git a/doc/user/project/integrations/slack.md b/doc/user/project/integrations/slack.md
index 4911df54c19..a1bff1ea920 100644
--- a/doc/user/project/integrations/slack.md
+++ b/doc/user/project/integrations/slack.md
@@ -134,7 +134,8 @@ To disable notifications for all projects that have Slack integration enabled,
 [start a rails console session](../../../administration/operations/rails_console.md#starting-a-rails-console-session) and use a script similar to the following:
 
 WARNING:
-Any command that changes data directly could be damaging if not run correctly, or under the right conditions. We highly recommend running them in a test environment with a backup of the instance ready to be restored, just in case.
+
+Commands that change data can cause damage if not run correctly or under the right conditions. Always run commands in a test environment first and have a backup instance ready to restore.
 
 ```ruby
 # Grab all projects that have the Slack notifications enabled
diff --git a/doc/user/project/repository/mirror/index.md b/doc/user/project/repository/mirror/index.md
index b0ac6277b8b..4ce162ac95e 100644
--- a/doc/user/project/repository/mirror/index.md
+++ b/doc/user/project/repository/mirror/index.md
@@ -326,7 +326,8 @@ repository mirroring, mirroring breaks when people leave the company. Use this
 script to migrate disparate mirroring users and tokens into a single service account:
 
 WARNING:
-Any command that changes data directly could be damaging if not run correctly, or under the right conditions. We highly recommend running them in a test environment with a backup of the instance ready to be restored, just in case.
+
+Commands that change data can cause damage if not run correctly or under the right conditions. Always run commands in a test environment first and have a backup instance ready to restore.
 
 ```ruby
 svc_user = User.find_by(username: 'ourServiceUser')
diff --git a/doc/user/project/repository/push_rules.md b/doc/user/project/repository/push_rules.md
index 917fca03967..d7ceb0ae131 100644
--- a/doc/user/project/repository/push_rules.md
+++ b/doc/user/project/repository/push_rules.md
@@ -304,7 +304,8 @@ For example, to enable **Check whether the commit author is a GitLab user** and
 and create a filter for allowing commits from a specific email domain only through rails console:
 
 WARNING:
-Any command that changes data directly could be damaging if not run correctly, or under the right conditions. We highly recommend running them in a test environment with a backup of the instance ready to be restored, just in case.
+
+Commands that change data can cause damage if not run correctly or under the right conditions. Always run commands in a test environment first and have a backup instance ready to restore.
 
 ``` ruby
 Project.find_each do |p|
diff --git a/doc/user/project/working_with_projects.md b/doc/user/project/working_with_projects.md
index 705e49df039..709bc63e72b 100644
--- a/doc/user/project/working_with_projects.md
+++ b/doc/user/project/working_with_projects.md
@@ -516,7 +516,8 @@ If a project or repository has been updated but the state is not reflected in th
 You can do so through [a Rails console session](../../administration/operations/rails_console.md#starting-a-rails-console-session) and one of the following:
 
 WARNING:
-Any command that changes data directly could be damaging if not run correctly, or under the right conditions. We highly recommend running them in a test environment with a backup of the instance ready to be restored, just in case.
+
+Commands that change data can cause damage if not run correctly or under the right conditions. Always run commands in a test environment first and have a backup instance ready to restore.
 
 ```ruby
 ## Clear project cache
@@ -545,7 +546,8 @@ end
 If a project cannot be deleted, you can attempt to delete it through [Rails console](../../administration/operations/rails_console.md#starting-a-rails-console-session).
 
 WARNING:
-Any command that changes data directly could be damaging if not run correctly, or under the right conditions. We highly recommend running them in a test environment with a backup of the instance ready to be restored, just in case.
+
+Commands that change data can cause damage if not run correctly or under the right conditions. Always run commands in a test environment first and have a backup instance ready to restore.
 
 ```ruby
 project = Project.find_by_full_path('<project_path>')
@@ -569,7 +571,8 @@ To toggle a specific feature, you can [start a Rails console session](../../admi
 and run the following function:
 
 WARNING:
-Any command that changes data directly could be damaging if not run correctly, or under the right conditions. We highly recommend running them in a test environment with a backup of the instance ready to be restored, just in case.
+
+Commands that change data can cause damage if not run correctly or under the right conditions. Always run commands in a test environment first and have a backup instance ready to restore.
 
 ```ruby
 projects = Group.find_by_name('_group_name').projects
diff --git a/lib/api/discussions.rb b/lib/api/discussions.rb
index f73e4b621ab..d3a25a076a0 100644
--- a/lib/api/discussions.rb
+++ b/lib/api/discussions.rb
@@ -18,17 +18,19 @@ module API
     Helpers::DiscussionsHelpers.feature_category_per_noteable_type.each do |noteable_type, feature_category|
       parent_type = noteable_type.parent_class.to_s.underscore
       noteables_str = noteable_type.to_s.underscore.pluralize
+      notable_name = noteable_type.to_s.underscore.humanize.downcase
+      notable_id_type = noteable_type == Commit ? String : Integer
       noteables_path = noteable_type == Commit ? "repository/#{noteables_str}" : noteables_str
 
       params do
         requires :id, type: String, desc: "The ID of a #{parent_type}"
       end
       resource parent_type.pluralize.to_sym, requirements: API::NAMESPACE_OR_PROJECT_REQUIREMENTS do
-        desc "Get a list of #{noteable_type.to_s.downcase} discussions" do
+        desc "Get a list of #{notable_name} discussions" do
           success Entities::Discussion
         end
         params do
-          requires :noteable_id, types: [Integer, String], desc: 'The ID of the noteable'
+          requires :noteable_id, type: notable_id_type, desc: "The ID of the #{notable_name}"
           use :pagination
         end
 
@@ -41,12 +43,12 @@ module API
           present Discussion.build_collection(notes, noteable), with: Entities::Discussion
         end
 
-        desc "Get a single #{noteable_type.to_s.downcase} discussion" do
+        desc "Get a single #{notable_name} discussion" do
           success Entities::Discussion
         end
         params do
           requires :discussion_id, type: String, desc: 'The ID of a discussion'
-          requires :noteable_id, types: [Integer, String], desc: 'The ID of the noteable'
+          requires :noteable_id, type: notable_id_type, desc: "The ID of the #{notable_name}"
         end
         get ":id/#{noteables_path}/:noteable_id/discussions/:discussion_id", feature_category: feature_category do
           noteable = find_noteable(noteable_type, params[:noteable_id])
@@ -61,39 +63,44 @@ module API
           present discussion, with: Entities::Discussion
         end
 
-        desc "Create a new #{noteable_type.to_s.downcase} discussion" do
+        desc "Create a new #{notable_name} discussion" do
           success Entities::Discussion
         end
         params do
-          requires :noteable_id, types: [Integer, String], desc: 'The ID of the noteable'
+          requires :noteable_id, type: notable_id_type, desc: "The ID of the #{notable_name}"
           requires :body, type: String, desc: 'The content of a note'
           optional :created_at, type: String, desc: 'The creation date of the note'
-          optional :position, type: Hash do
-            requires :base_sha, type: String, desc: 'Base commit SHA in the source branch'
-            requires :start_sha, type: String, desc: 'SHA referencing commit in target branch'
-            requires :head_sha, type: String, desc: 'SHA referencing HEAD of this merge request'
-            requires :position_type, type: String, desc: 'Type of the position reference', values: %w(text image)
-            optional :new_path, type: String, desc: 'File path after change'
-            optional :new_line, type: Integer, desc: 'Line number after change'
-            optional :old_path, type: String, desc: 'File path before change'
-            optional :old_line, type: Integer, desc: 'Line number before change'
-            optional :width, type: Integer, desc: 'Width of the image'
-            optional :height, type: Integer, desc: 'Height of the image'
-            optional :x, type: Integer, desc: 'X coordinate in the image'
-            optional :y, type: Integer, desc: 'Y coordinate in the image'
 
-            optional :line_range, type: Hash, desc: 'Multi-line start and end' do
-              optional :start, type: Hash do
-                optional :line_code, type: String, desc: 'Start line code for multi-line note'
-                optional :type, type: String, desc: 'Start line type for multi-line note'
-                optional :old_line, type: String, desc: 'Start old_line line number'
-                optional :new_line, type: String, desc: 'Start new_line line number'
-              end
-              optional :end, type: Hash do
-                optional :line_code, type: String, desc: 'End line code for multi-line note'
-                optional :type, type: String, desc: 'End line type for multi-line note'
-                optional :old_line, type: String, desc: 'End old_line line number'
-                optional :new_line, type: String, desc: 'End new_line line number'
+          if [Commit, MergeRequest].include?(noteable_type)
+            optional :position, type: Hash do
+              requires :base_sha, type: String, desc: 'Base commit SHA in the source branch'
+              requires :start_sha, type: String, desc: 'SHA referencing commit in target branch'
+              requires :head_sha, type: String, desc: 'SHA referencing HEAD of this merge request'
+              requires :position_type, type: String, desc: 'Type of the position reference', values: %w(text image)
+              optional :new_path, type: String, desc: 'File path after change'
+              optional :new_line, type: Integer, desc: 'Line number after change'
+              optional :old_path, type: String, desc: 'File path before change'
+              optional :old_line, type: Integer, desc: 'Line number before change'
+              optional :width, type: Integer, desc: 'Width of the image'
+              optional :height, type: Integer, desc: 'Height of the image'
+              optional :x, type: Integer, desc: 'X coordinate in the image'
+              optional :y, type: Integer, desc: 'Y coordinate in the image'
+
+              if noteable_type == MergeRequest
+                optional :line_range, type: Hash, desc: 'Multi-line start and end' do
+                  optional :start, type: Hash do
+                    optional :line_code, type: String, desc: 'Start line code for multi-line note'
+                    optional :type, type: String, desc: 'Start line type for multi-line note'
+                    optional :old_line, type: String, desc: 'Start old_line line number'
+                    optional :new_line, type: String, desc: 'Start new_line line number'
+                  end
+                  optional :end, type: Hash do
+                    optional :line_code, type: String, desc: 'End line code for multi-line note'
+                    optional :type, type: String, desc: 'End line type for multi-line note'
+                    optional :old_line, type: String, desc: 'End old_line line number'
+                    optional :new_line, type: String, desc: 'End new_line line number'
+                  end
+                end
               end
             end
           end
@@ -122,12 +129,12 @@ module API
           end
         end
 
-        desc "Get comments in a single #{noteable_type.to_s.downcase} discussion" do
+        desc "Get comments in a single #{notable_name} discussion" do
           success Entities::Discussion
         end
         params do
           requires :discussion_id, type: String, desc: 'The ID of a discussion'
-          requires :noteable_id, types: [Integer, String], desc: 'The ID of the noteable'
+          requires :noteable_id, type: notable_id_type, desc: "The ID of the #{notable_name}"
         end
         get ":id/#{noteables_path}/:noteable_id/discussions/:discussion_id/notes", feature_category: feature_category do
           noteable = find_noteable(noteable_type, params[:noteable_id])
@@ -140,11 +147,11 @@ module API
           present notes, with: Entities::Note
         end
 
-        desc "Add a comment to a #{noteable_type.to_s.downcase} discussion" do
+        desc "Add a comment to a #{notable_name} discussion" do
           success Entities::Note
         end
         params do
-          requires :noteable_id, types: [Integer, String], desc: 'The ID of the noteable'
+          requires :noteable_id, type: notable_id_type, desc: "The ID of the #{notable_name}"
           requires :discussion_id, type: String, desc: 'The ID of a discussion'
           requires :body, type: String, desc: 'The content of a note'
           optional :created_at, type: String, desc: 'The creation date of the note'
@@ -175,11 +182,11 @@ module API
           end
         end
 
-        desc "Get a comment in a #{noteable_type.to_s.downcase} discussion" do
+        desc "Get a comment in a #{notable_name} discussion" do
           success Entities::Note
         end
         params do
-          requires :noteable_id, types: [Integer, String], desc: 'The ID of the noteable'
+          requires :noteable_id, type: notable_id_type, desc: "The ID of the #{notable_name}"
           requires :discussion_id, type: String, desc: 'The ID of a discussion'
           requires :note_id, type: Integer, desc: 'The ID of a note'
         end
@@ -189,11 +196,11 @@ module API
           get_note(noteable, params[:note_id])
         end
 
-        desc "Edit a comment in a #{noteable_type.to_s.downcase} discussion" do
+        desc "Edit a comment in a #{notable_name} discussion" do
           success Entities::Note
         end
         params do
-          requires :noteable_id, types: [Integer, String], desc: 'The ID of the noteable'
+          requires :noteable_id, type: notable_id_type, desc: "The ID of the #{notable_name}"
           requires :discussion_id, type: String, desc: 'The ID of a discussion'
           requires :note_id, type: Integer, desc: 'The ID of a note'
           optional :body, type: String, desc: 'The content of a note'
@@ -210,11 +217,11 @@ module API
           end
         end
 
-        desc "Delete a comment in a #{noteable_type.to_s.downcase} discussion" do
+        desc "Delete a comment in a #{notable_name} discussion" do
           success Entities::Note
         end
         params do
-          requires :noteable_id, types: [Integer, String], desc: 'The ID of the noteable'
+          requires :noteable_id, type: notable_id_type, desc: "The ID of the #{notable_name}"
           requires :discussion_id, type: String, desc: 'The ID of a discussion'
           requires :note_id, type: Integer, desc: 'The ID of a note'
         end
@@ -225,11 +232,11 @@ module API
         end
 
         if Noteable.resolvable_types.include?(noteable_type.to_s)
-          desc "Resolve/unresolve an existing #{noteable_type.to_s.downcase} discussion" do
+          desc "Resolve/unresolve an existing #{notable_name} discussion" do
             success Entities::Discussion
           end
           params do
-            requires :noteable_id, types: [Integer, String], desc: 'The ID of the noteable'
+            requires :noteable_id, type: notable_id_type, desc: "The ID of the #{notable_name}"
             requires :discussion_id, type: String, desc: 'The ID of a discussion'
             requires :resolved, type: Boolean, desc: 'Mark discussion resolved/unresolved'
           end
diff --git a/package.json b/package.json
index b5b6d5576a3..e72b1cf5870 100644
--- a/package.json
+++ b/package.json
@@ -54,7 +54,7 @@
     "@gitlab/at.js": "1.5.7",
     "@gitlab/favicon-overlay": "2.0.0",
     "@gitlab/svgs": "3.5.0",
-    "@gitlab/ui": "49.0.0",
+    "@gitlab/ui": "49.0.1",
     "@gitlab/visual-review-tools": "1.7.3",
     "@gitlab/web-ide": "0.0.1-dev-20220815034418",
     "@rails/actioncable": "6.1.4-7",
diff --git a/spec/frontend/artifacts/components/artifact_row_spec.js b/spec/frontend/artifacts/components/artifact_row_spec.js
index ccde3bbbf98..dcc0d684f13 100644
--- a/spec/frontend/artifacts/components/artifact_row_spec.js
+++ b/spec/frontend/artifacts/components/artifact_row_spec.js
@@ -1,4 +1,4 @@
-import { GlBadge, GlButton } from '@gitlab/ui';
+import { GlBadge, GlButton, GlFriendlyWrap } from '@gitlab/ui';
 import mockGetJobArtifactsResponse from 'test_fixtures/graphql/artifacts/graphql/queries/get_job_artifacts.query.graphql.json';
 import { numberToHumanSize } from '~/lib/utils/number_utils';
 import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
@@ -23,7 +23,7 @@ describe('ArtifactRow component', () => {
         isLoading: false,
         isLastRow: false,
       },
-      stubs: { GlBadge, GlButton },
+      stubs: { GlBadge, GlButton, GlFriendlyWrap },
     });
   };
 
diff --git a/yarn.lock b/yarn.lock
index 8c825fb2c80..2aa25e5944d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1113,10 +1113,10 @@
   resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-3.5.0.tgz#226240b7aa93db986f4c6f7738ca2a1846b5234d"
   integrity sha512-/djPsJzUY7i/FaydRVt3ZyXiFf5HGNo1rg2mfLn1EpXvT4zc2ag5ECwnYcPb97KgqFCJX6Tk+Ndu8Wh3GoOW1g==
 
-"@gitlab/ui@49.0.0":
-  version "49.0.0"
-  resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-49.0.0.tgz#dee2b7de7e4d7e281cd7ccf324d0fb5ad3086a5c"
-  integrity sha512-UOPiGi12wTvbqzJAWo1PDmtZXvcSzy5/auh8qKO9l3uYo4j0RpqYeloSkLvRSKs3V82lpVi0pyJt/S+mMzPjxA==
+"@gitlab/ui@49.0.1":
+  version "49.0.1"
+  resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-49.0.1.tgz#ee26f7250363502bb4d5b15f40534f4f68e65a6d"
+  integrity sha512-u/qMexzVckgf1zyKmXGDsSUzeF7CLBJP4EvdgN9ijDmq1mQRhGKx73FRUc7g+RSCSQCPpxhD5k1vY7aTouxYgQ==
   dependencies:
     "@popperjs/core" "^2.11.2"
     bootstrap-vue "2.20.1"