Add latest changes from gitlab-org/gitlab@master

15 files changed, 20 insertions, 21 deletions

diff --git a/db/docs/application_settings.yml b/db/docs/application_settings.yml
index 578e8ad5c3d..ae28221b7ac 100644
--- a/db/docs/application_settings.yml
+++ b/db/docs/application_settings.yml
@@ -6,7 +6,6 @@ feature_categories:
 - continuous_integration
 - integrations
 - metrics
-- pages
 - service_ping
 - source_code_management
 description: GitLab application settings
diff --git a/db/docs/award_emoji.yml b/db/docs/award_emoji.yml
index feef2ee340e..7405e3e57e2 100644
--- a/db/docs/award_emoji.yml
+++ b/db/docs/award_emoji.yml
@@ -3,7 +3,7 @@ table_name: award_emoji
 classes:
 - AwardEmoji
 feature_categories:
-- snippets
-description: TODO
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/3bdc57f0a710b3769381ecad7ea4098223ecff56
+- team_planning
+description: Store the awarding of emoji by users on Issues, Epics, and other Awardables.
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/3785
 milestone: '8.9'
diff --git a/db/docs/group_wiki_repositories.yml b/db/docs/group_wiki_repositories.yml
index 80f48f2117f..0c4ce444958 100644
--- a/db/docs/group_wiki_repositories.yml
+++ b/db/docs/group_wiki_repositories.yml
@@ -4,6 +4,6 @@ classes:
 - GroupWikiRepository
 feature_categories:
 - wiki
-description: TODO
+description: Stores information about group wiki repositories.
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/31121
 milestone: '13.0'
diff --git a/db/docs/pages_deployment_states.yml b/db/docs/pages_deployment_states.yml
index 9e526eea46e..dd0ff12abbe 100644
--- a/db/docs/pages_deployment_states.yml
+++ b/db/docs/pages_deployment_states.yml
@@ -4,6 +4,6 @@ classes:
 - Geo::PagesDeploymentState
 feature_categories:
 - pages
-description: TODO
+description: Stores verification state for Geo replicated Pages deployments.
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74905
 milestone: '14.6'
diff --git a/db/docs/pages_deployments.yml b/db/docs/pages_deployments.yml
index 2939913b94e..606147f9887 100644
--- a/db/docs/pages_deployments.yml
+++ b/db/docs/pages_deployments.yml
@@ -4,6 +4,6 @@ classes:
 - PagesDeployment
 feature_categories:
 - pages
-description: TODO
+description: Stores ZIP archives for GitLab Pages websites.
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/41785
 milestone: '13.4'
diff --git a/db/docs/pages_domain_acme_orders.yml b/db/docs/pages_domain_acme_orders.yml
index 7c1a31eac26..1bc97c3e47e 100644
--- a/db/docs/pages_domain_acme_orders.yml
+++ b/db/docs/pages_domain_acme_orders.yml
@@ -4,6 +4,6 @@ classes:
 - PagesDomainAcmeOrder
 feature_categories:
 - pages
-description: TODO
+description: Stores ACME order information used in obtaining Let's Encrypt certificates for GitLab Pages domains.
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/14014
 milestone: '12.0'
diff --git a/db/docs/pages_domains.yml b/db/docs/pages_domains.yml
index 8fecb70740c..e0fc084c4c2 100644
--- a/db/docs/pages_domains.yml
+++ b/db/docs/pages_domains.yml
@@ -4,6 +4,6 @@ classes:
 - PagesDomain
 feature_categories:
 - pages
-description: TODO
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/807a5494fa543392ea7a996b479e577d41ff6344
+description: Store Pages domain, certificate and encryption meta data.
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/173
 milestone: '8.5'
diff --git a/db/docs/project_pages_metadata.yml b/db/docs/project_pages_metadata.yml
index 38da6c77f83..aa792520bc3 100644
--- a/db/docs/project_pages_metadata.yml
+++ b/db/docs/project_pages_metadata.yml
@@ -4,6 +4,6 @@ classes:
 - ProjectPagesMetadatum
 feature_categories:
 - pages
-description: TODO
+description: Store GitLab Pages metadata for projects.
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/17197
 milestone: '12.4'
diff --git a/db/docs/snippet_repositories.yml b/db/docs/snippet_repositories.yml
index c8bffcd9f7a..52a6b96c42c 100644
--- a/db/docs/snippet_repositories.yml
+++ b/db/docs/snippet_repositories.yml
@@ -4,6 +4,6 @@ classes:
 - SnippetRepository
 feature_categories:
 - snippets
-description: TODO
+description: Stores repository information used to version control snippets.
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/23796
 milestone: '12.8'
diff --git a/db/docs/snippet_statistics.yml b/db/docs/snippet_statistics.yml
index d6c77e5c235..390d096d1d3 100644
--- a/db/docs/snippet_statistics.yml
+++ b/db/docs/snippet_statistics.yml
@@ -4,6 +4,6 @@ classes:
 - SnippetStatistics
 feature_categories:
 - snippets
-description: TODO
+description: Stores the repository size, commit count, and file count regarding the snippet repository.
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/35026
 milestone: '13.2'
diff --git a/db/docs/snippet_user_mentions.yml b/db/docs/snippet_user_mentions.yml
index 726b10aa62e..aee265b202a 100644
--- a/db/docs/snippet_user_mentions.yml
+++ b/db/docs/snippet_user_mentions.yml
@@ -4,6 +4,6 @@ classes:
 - SnippetUserMention
 feature_categories:
 - snippets
-description: TODO
+description: For storing mentioned users, groups, projects referenced in a snippet description.
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/19009
 milestone: '12.6'
diff --git a/db/docs/snippets.yml b/db/docs/snippets.yml
index b370e9c3bd6..1d8f7ca6b15 100644
--- a/db/docs/snippets.yml
+++ b/db/docs/snippets.yml
@@ -6,6 +6,6 @@ classes:
 - Snippet
 feature_categories:
 - snippets
-description: TODO
+description: GitLab snippets allow you to store and share bits of code and text with other users. 
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/9265de3d25715aeafd38a4ef41596dca058dc18c
-milestone: "<6.0"
+milestone: "1.0.1"
diff --git a/db/docs/user_agent_details.yml b/db/docs/user_agent_details.yml
index ae49ded4348..53292bf93f1 100644
--- a/db/docs/user_agent_details.yml
+++ b/db/docs/user_agent_details.yml
@@ -3,7 +3,7 @@ table_name: user_agent_details
 classes:
 - UserAgentDetail
 feature_categories:
-- snippets
-description: TODO
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/95419679f23f0628d1885dd9656cc159e9d55ea9
+- instance_resiliency
+description: Stores user agent details for submission to Akismet spam detection.
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/5538
 milestone: '8.11'
diff --git a/db/docs/wiki_page_meta.yml b/db/docs/wiki_page_meta.yml
index b5b28d1e8e0..bed636eed08 100644
--- a/db/docs/wiki_page_meta.yml
+++ b/db/docs/wiki_page_meta.yml
@@ -4,6 +4,6 @@ classes:
 - WikiPage::Meta
 feature_categories:
 - wiki
-description: TODO
+description: Used to record the metadata for wiki pages when we create events.
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/26529
 milestone: '13.0'
diff --git a/db/docs/wiki_page_slugs.yml b/db/docs/wiki_page_slugs.yml
index e0e29ea41ad..a6997322f73 100644
--- a/db/docs/wiki_page_slugs.yml
+++ b/db/docs/wiki_page_slugs.yml
@@ -4,6 +4,6 @@ classes:
 - WikiPage::Slug
 feature_categories:
 - wiki
-description: TODO
+description: Stores wiki page slug metadata for when we create events.
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/26529
 milestone: '13.0'