Merge branch 'master' into 'check-min-schema-migrate'

# Conflicts:
#   lib/gitlab/database.rb

48 files changed, 201 insertions, 40 deletions

diff --git a/changelogs/unreleased/11039-moved-code-difference-from-EE-to-CE.yml b/changelogs/unreleased/11039-moved-code-difference-from-EE-to-CE.yml
new file mode 100644
index 00000000000..10c5eed9556
--- /dev/null
+++ b/changelogs/unreleased/11039-moved-code-difference-from-EE-to-CE.yml
@@ -0,0 +1,5 @@
+---
+title: "Moved EE/CE code differences for file `app/views/search/_category.html.haml` into CE"
+merge_request: 28755
+author: Michel Engelen
+type: other
diff --git a/changelogs/unreleased/11888-regression-deploy-correlation-markers-on-monitoring-graphs-not-clickable.yml b/changelogs/unreleased/11888-regression-deploy-correlation-markers-on-monitoring-graphs-not-clickable.yml
new file mode 100644
index 00000000000..606abe818b4
--- /dev/null
+++ b/changelogs/unreleased/11888-regression-deploy-correlation-markers-on-monitoring-graphs-not-clickable.yml
@@ -0,0 +1,5 @@
+---
+title: Turn commit sha in monitor charts popover to link
+merge_request: 29914
+author:
+type: fixed
diff --git a/changelogs/unreleased/44949-do-not-update-updated_at-on-an-issue-when-reordering-it.yml b/changelogs/unreleased/44949-do-not-update-updated_at-on-an-issue-when-reordering-it.yml
new file mode 100644
index 00000000000..efc6af7845c
--- /dev/null
+++ b/changelogs/unreleased/44949-do-not-update-updated_at-on-an-issue-when-reordering-it.yml
@@ -0,0 +1,5 @@
+---
+title: Will not update issue timestamps when changing positions in a list
+merge_request: 29677
+author:
+type: changed
diff --git a/changelogs/unreleased/51952-forking-via-webide.yml b/changelogs/unreleased/51952-forking-via-webide.yml
new file mode 100644
index 00000000000..4497c6b6ca4
--- /dev/null
+++ b/changelogs/unreleased/51952-forking-via-webide.yml
@@ -0,0 +1,5 @@
+---
+title: Resolve "500 error when forking via the web IDE button"
+merge_request: 29909
+author:
+type: fixed
diff --git a/changelogs/unreleased/53811-issue-boards-to-core-projects-backend-ce.yml b/changelogs/unreleased/53811-issue-boards-to-core-projects-backend-ce.yml
new file mode 100644
index 00000000000..d8fbd7ec362
--- /dev/null
+++ b/changelogs/unreleased/53811-issue-boards-to-core-projects-backend-ce.yml
@@ -0,0 +1,5 @@
+---
+title: Move Multiple Issue Boards for Projects to Core
+merge_request:
+author:
+type: added
diff --git a/changelogs/unreleased/54595-incorrect-reaction-emoji-placement-in-discussion.yml b/changelogs/unreleased/54595-incorrect-reaction-emoji-placement-in-discussion.yml
new file mode 100644
index 00000000000..639eefb50cb
--- /dev/null
+++ b/changelogs/unreleased/54595-incorrect-reaction-emoji-placement-in-discussion.yml
@@ -0,0 +1,5 @@
+---
+title: Fix incorrect emoji placement in commit diff discussion
+merge_request: 29445
+author:
+type: fixed
diff --git a/changelogs/unreleased/58689-regroup-jump-button-in-discussion.yml b/changelogs/unreleased/58689-regroup-jump-button-in-discussion.yml
new file mode 100644
index 00000000000..bf6f314f0ce
--- /dev/null
+++ b/changelogs/unreleased/58689-regroup-jump-button-in-discussion.yml
@@ -0,0 +1,6 @@
+---
+title: Improve discussion reply buttons layout and how jump to next discussion button
+  appears
+merge_request: 29779
+author:
+type: changed
diff --git a/changelogs/unreleased/58802-rename-webide.yml b/changelogs/unreleased/58802-rename-webide.yml
new file mode 100644
index 00000000000..40471d967ce
--- /dev/null
+++ b/changelogs/unreleased/58802-rename-webide.yml
@@ -0,0 +1,5 @@
+---
+title: Re-name files in Web IDE in a more natural way
+merge_request: 29948
+author:
+type: changed
diff --git a/changelogs/unreleased/59702-fix-notification-flags-for-ms-teams.yml b/changelogs/unreleased/59702-fix-notification-flags-for-ms-teams.yml
deleted file mode 100644
index 14a8da95ed9..00000000000
--- a/changelogs/unreleased/59702-fix-notification-flags-for-ms-teams.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----

-title: Fix missing API notification flags for Microsoft Teams

-merge_request: 29824

-author: Seiji Suenaga

-type: fixed

diff --git a/changelogs/unreleased/61156-instance-level-cluster-pod-terminal-access.yml b/changelogs/unreleased/61156-instance-level-cluster-pod-terminal-access.yml
new file mode 100644
index 00000000000..0b8d301352b
--- /dev/null
+++ b/changelogs/unreleased/61156-instance-level-cluster-pod-terminal-access.yml
@@ -0,0 +1,5 @@
+---
+title: Enable terminals for instance and group clusters
+merge_request: 28613
+author:
+type: added
diff --git a/changelogs/unreleased/62826-graphql-emoji-mutations.yml b/changelogs/unreleased/62826-graphql-emoji-mutations.yml
new file mode 100644
index 00000000000..0c0aaedf844
--- /dev/null
+++ b/changelogs/unreleased/62826-graphql-emoji-mutations.yml
@@ -0,0 +1,5 @@
+---
+title: GraphQL mutations for add, remove and toggle emoji
+merge_request: 29919
+author:
+type: added
diff --git a/changelogs/unreleased/62938-wcag-aa-edited-text-color.yml b/changelogs/unreleased/62938-wcag-aa-edited-text-color.yml
new file mode 100644
index 00000000000..6652e495869
--- /dev/null
+++ b/changelogs/unreleased/62938-wcag-aa-edited-text-color.yml
@@ -0,0 +1,5 @@
+---
+title: Use darker gray color for system note metadata and edited text
+merge_request: 30054
+author:
+type: other
diff --git a/changelogs/unreleased/62968-environment-details-header-border-misaligned.yml b/changelogs/unreleased/62968-environment-details-header-border-misaligned.yml
new file mode 100644
index 00000000000..749fe6a9cb0
--- /dev/null
+++ b/changelogs/unreleased/62968-environment-details-header-border-misaligned.yml
@@ -0,0 +1,5 @@
+---
+title: Resolve Environment details header border misaligned
+merge_request: 30011
+author:
+type: fixed
diff --git a/changelogs/unreleased/63200-reply-button-broken.yml b/changelogs/unreleased/63200-reply-button-broken.yml
new file mode 100644
index 00000000000..11f81dbd925
--- /dev/null
+++ b/changelogs/unreleased/63200-reply-button-broken.yml
@@ -0,0 +1,5 @@
+---
+title: Fix unresponsive reply button in discussions
+merge_request: 29936
+author:
+type: fixed
diff --git a/changelogs/unreleased/63247-add-conf-toast-and-link.yml b/changelogs/unreleased/63247-add-conf-toast-and-link.yml
new file mode 100644
index 00000000000..915cc20dcc8
--- /dev/null
+++ b/changelogs/unreleased/63247-add-conf-toast-and-link.yml
@@ -0,0 +1,5 @@
+---
+title: Include a link back to the MR for Visual Review feedback form
+merge_request: 29719
+author:
+type: changed
diff --git a/changelogs/unreleased/63479-jira-capitalization.yml b/changelogs/unreleased/63479-jira-capitalization.yml
new file mode 100644
index 00000000000..a4cc32beba6
--- /dev/null
+++ b/changelogs/unreleased/63479-jira-capitalization.yml
@@ -0,0 +1,5 @@
+---
+title: Replace 'JIRA' with 'Jira'
+merge_request: 29849
+author: Takuya Noguchi
+type: other
diff --git a/changelogs/unreleased/63513-ensure-gitlab-jsoncache-includes-the-gitlab-version-in-the-cache-key.yml b/changelogs/unreleased/63513-ensure-gitlab-jsoncache-includes-the-gitlab-version-in-the-cache-key.yml
deleted file mode 100644
index b5715902630..00000000000
--- a/changelogs/unreleased/63513-ensure-gitlab-jsoncache-includes-the-gitlab-version-in-the-cache-key.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Include the GitLab version in the cache key for Gitlab::JsonCache
-merge_request: 29938
-author:
-type: fixed
diff --git a/changelogs/unreleased/add-metrics-dashboard-permission-check.yml b/changelogs/unreleased/add-metrics-dashboard-permission-check.yml
new file mode 100644
index 00000000000..0ea2c4c8e41
--- /dev/null
+++ b/changelogs/unreleased/add-metrics-dashboard-permission-check.yml
@@ -0,0 +1,5 @@
+---
+title: Add permission check to metrics dashboards endpoint
+merge_request: 30017
+author:
+type: added
diff --git a/changelogs/unreleased/always-allow-prometheus-access-in-dev.yml b/changelogs/unreleased/always-allow-prometheus-access-in-dev.yml
new file mode 100644
index 00000000000..acd944ea684
--- /dev/null
+++ b/changelogs/unreleased/always-allow-prometheus-access-in-dev.yml
@@ -0,0 +1,5 @@
+---
+title: Always allow access to health endpoints from localhost in dev
+merge_request: 29930
+author:
+type: other
diff --git a/changelogs/unreleased/always-display-environment-selector.yml b/changelogs/unreleased/always-display-environment-selector.yml
new file mode 100644
index 00000000000..7a55e8f3e5d
--- /dev/null
+++ b/changelogs/unreleased/always-display-environment-selector.yml
@@ -0,0 +1,5 @@
+---
+title: Fix broken environment selector and always display it on monitoring dashboard
+merge_request: 29705
+author:
+type: fixed
diff --git a/changelogs/unreleased/bug-63162-duplicate_path_in_links.yml b/changelogs/unreleased/bug-63162-duplicate_path_in_links.yml
deleted file mode 100644
index d3f246492fb..00000000000
--- a/changelogs/unreleased/bug-63162-duplicate_path_in_links.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fixed 'diff version changes' link not working
-merge_request: 29825
-author:
-type: fixed
diff --git a/changelogs/unreleased/ce-11098-update-merge-request-settings-description-text.yml b/changelogs/unreleased/ce-11098-update-merge-request-settings-description-text.yml
new file mode 100644
index 00000000000..9f6a2040095
--- /dev/null
+++ b/changelogs/unreleased/ce-11098-update-merge-request-settings-description-text.yml
@@ -0,0 +1,5 @@
+---
+title: Update merge requests section description text on project settings page
+merge_request: 27838
+author:
+type: changed
\ No newline at end of file
diff --git a/changelogs/unreleased/dohtaset.yml b/changelogs/unreleased/dohtaset.yml
new file mode 100644
index 00000000000..5b917bd06d8
--- /dev/null
+++ b/changelogs/unreleased/dohtaset.yml
@@ -0,0 +1,5 @@
+---
+title: Fix charts on Cluster health page
+merge_request: 30073
+author:
+type: fixed
diff --git a/changelogs/unreleased/dz-remove-deprecated-user-routes.yml b/changelogs/unreleased/dz-remove-deprecated-user-routes.yml
new file mode 100644
index 00000000000..92c2e39dd20
--- /dev/null
+++ b/changelogs/unreleased/dz-remove-deprecated-user-routes.yml
@@ -0,0 +1,5 @@
+---
+title: Remove depreated /u/:username routing
+merge_request: 30044
+author:
+type: removed
diff --git a/changelogs/unreleased/fe-issue-reorder.yml b/changelogs/unreleased/fe-issue-reorder.yml
new file mode 100644
index 00000000000..aca334b6149
--- /dev/null
+++ b/changelogs/unreleased/fe-issue-reorder.yml
@@ -0,0 +1,5 @@
+---
+title: Bring Manual Ordering on Issue List
+merge_request: 29410
+author:
+type: added
diff --git a/changelogs/unreleased/fix-jupyter-git-v3.yml b/changelogs/unreleased/fix-jupyter-git-v3.yml
new file mode 100644
index 00000000000..8aaaaf249fb
--- /dev/null
+++ b/changelogs/unreleased/fix-jupyter-git-v3.yml
@@ -0,0 +1,5 @@
+---
+title: Fix Jupyter-Git integration
+merge_request: 30020
+author: Amit Rathi
+type: fixed
diff --git a/changelogs/unreleased/fix-labels-in-hooks.yml b/changelogs/unreleased/fix-labels-in-hooks.yml
deleted file mode 100644
index c0904a860c5..00000000000
--- a/changelogs/unreleased/fix-labels-in-hooks.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix label serialization in issue and note hooks
-merge_request: 29850
-author:
-type: fixed
diff --git a/changelogs/unreleased/fix-notes-emails-with-group-settings.yml b/changelogs/unreleased/fix-notes-emails-with-group-settings.yml
deleted file mode 100644
index 77dae8418a8..00000000000
--- a/changelogs/unreleased/fix-notes-emails-with-group-settings.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix comment emails not respecting group-level notification email
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/graphql-tree-last-commit.yml b/changelogs/unreleased/graphql-tree-last-commit.yml
new file mode 100644
index 00000000000..5104ca6687e
--- /dev/null
+++ b/changelogs/unreleased/graphql-tree-last-commit.yml
@@ -0,0 +1,5 @@
+---
+title: Added commit type to tree GraphQL response
+merge_request: 29412
+author:
+type: added
diff --git a/changelogs/unreleased/id-extract-widget-into-different-request.yml b/changelogs/unreleased/id-extract-widget-into-different-request.yml
new file mode 100644
index 00000000000..3b9f5fdd6bd
--- /dev/null
+++ b/changelogs/unreleased/id-extract-widget-into-different-request.yml
@@ -0,0 +1,5 @@
+---
+title: Add a separate endpoint for fetching MRs serialized as widgets
+merge_request: 29979
+author:
+type: performance
diff --git a/changelogs/unreleased/po-raw-changes-encoding.yml b/changelogs/unreleased/po-raw-changes-encoding.yml
new file mode 100644
index 00000000000..051d18f50c7
--- /dev/null
+++ b/changelogs/unreleased/po-raw-changes-encoding.yml
@@ -0,0 +1,5 @@
+---
+title: Expect bytes from Gitaly RPC GetRawChanges
+merge_request: 28164
+author:
+type: fixed
diff --git a/changelogs/unreleased/refactor-sentry.yml b/changelogs/unreleased/refactor-sentry.yml
new file mode 100644
index 00000000000..25c5534fae0
--- /dev/null
+++ b/changelogs/unreleased/refactor-sentry.yml
@@ -0,0 +1,5 @@
+---
+title: Remove Sentry from application settings
+merge_request: 28447
+author: Roger Meier
+type: added
diff --git a/changelogs/unreleased/remove_group_and_instance_clusters_feature_flag.yml b/changelogs/unreleased/remove_group_and_instance_clusters_feature_flag.yml
new file mode 100644
index 00000000000..fcc6c564345
--- /dev/null
+++ b/changelogs/unreleased/remove_group_and_instance_clusters_feature_flag.yml
@@ -0,0 +1,5 @@
+---
+title: Remove group and instance clusters feature flag
+merge_request: 30124
+author:
+type: changed
diff --git a/changelogs/unreleased/set-higher-ttl-for-trace-write.yml b/changelogs/unreleased/set-higher-ttl-for-trace-write.yml
new file mode 100644
index 00000000000..9f17172100c
--- /dev/null
+++ b/changelogs/unreleased/set-higher-ttl-for-trace-write.yml
@@ -0,0 +1,5 @@
+---
+title: Set higher TTL for write lock of trace to prevent concurrent archiving
+merge_request: 30064
+author:
+type: fixed
diff --git a/changelogs/unreleased/sh-add-force-random-password-user-api.yml b/changelogs/unreleased/sh-add-force-random-password-user-api.yml
new file mode 100644
index 00000000000..29f36978a0f
--- /dev/null
+++ b/changelogs/unreleased/sh-add-force-random-password-user-api.yml
@@ -0,0 +1,5 @@
+---
+title: Add support for creating random passwords in user creation API
+merge_request: 30138
+author:
+type: changed
diff --git a/changelogs/unreleased/sh-add-gitaly-ref-caching-search-controller.yml b/changelogs/unreleased/sh-add-gitaly-ref-caching-search-controller.yml
new file mode 100644
index 00000000000..d4be28e9883
--- /dev/null
+++ b/changelogs/unreleased/sh-add-gitaly-ref-caching-search-controller.yml
@@ -0,0 +1,5 @@
+---
+title: Enable Gitaly ref caching for SearchController
+merge_request: 30105
+author:
+type: performance
diff --git a/changelogs/unreleased/sh-avoid-loading-pipeline-status.yml b/changelogs/unreleased/sh-avoid-loading-pipeline-status.yml
new file mode 100644
index 00000000000..2dead948786
--- /dev/null
+++ b/changelogs/unreleased/sh-avoid-loading-pipeline-status.yml
@@ -0,0 +1,5 @@
+---
+title: Avoid loading pipeline status in search results
+merge_request: 30111
+author:
+type: performance
diff --git a/changelogs/unreleased/sh-cache-negative-entries-find-commit.yml b/changelogs/unreleased/sh-cache-negative-entries-find-commit.yml
new file mode 100644
index 00000000000..98eb13ee620
--- /dev/null
+++ b/changelogs/unreleased/sh-cache-negative-entries-find-commit.yml
@@ -0,0 +1,5 @@
+---
+title: Allow caching of negative FindCommit matches
+merge_request: 29952
+author:
+type: performance
diff --git a/changelogs/unreleased/sh-handle-nil-replication-lag.yml b/changelogs/unreleased/sh-handle-nil-replication-lag.yml
new file mode 100644
index 00000000000..5638d7e79e3
--- /dev/null
+++ b/changelogs/unreleased/sh-handle-nil-replication-lag.yml
@@ -0,0 +1,5 @@
+---
+title: Fix background migrations failing with unused replication slot
+merge_request: 30042
+author:
+type: fixed
diff --git a/changelogs/unreleased/sh-omit-issues-links-on-poll.yml b/changelogs/unreleased/sh-omit-issues-links-on-poll.yml
deleted file mode 100644
index 21e51d3534f..00000000000
--- a/changelogs/unreleased/sh-omit-issues-links-on-poll.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Omit issues links in merge request entity API response
-merge_request: 29917
-author:
-type: performance
diff --git a/changelogs/unreleased/sh-quiet-backup-secrets-log.yml b/changelogs/unreleased/sh-quiet-backup-secrets-log.yml
deleted file mode 100644
index cf3e90c0cb1..00000000000
--- a/changelogs/unreleased/sh-quiet-backup-secrets-log.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Silence backup warnings when CRON=1 in use
-merge_request: 30033
-author:
-type: fixed
diff --git a/changelogs/unreleased/sh-recover-ee-schema-backport-migration-failure.yml b/changelogs/unreleased/sh-recover-ee-schema-backport-migration-failure.yml
deleted file mode 100644
index 1695e2827eb..00000000000
--- a/changelogs/unreleased/sh-recover-ee-schema-backport-migration-failure.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Prevent EE backport migrations from running if CE is not migrated
-merge_request: 30002
-author:
-type: fixed
diff --git a/changelogs/unreleased/sh-service-template-bug.yml b/changelogs/unreleased/sh-service-template-bug.yml
new file mode 100644
index 00000000000..1ea5ac84f26
--- /dev/null
+++ b/changelogs/unreleased/sh-service-template-bug.yml
@@ -0,0 +1,5 @@
+---
+title: Disable Rails SQL query cache when applying service templates
+merge_request: 30060
+author:
+type: fixed
diff --git a/changelogs/unreleased/sh-support-subnets-ip-rate-limiter.yml b/changelogs/unreleased/sh-support-subnets-ip-rate-limiter.yml
new file mode 100644
index 00000000000..3e78c58c764
--- /dev/null
+++ b/changelogs/unreleased/sh-support-subnets-ip-rate-limiter.yml
@@ -0,0 +1,5 @@
+---
+title: Support CIDR notation in IP rate limiter
+merge_request: 30146
+author:
+type: changed
diff --git a/changelogs/unreleased/sh-update-mermaid.yml b/changelogs/unreleased/sh-update-mermaid.yml
new file mode 100644
index 00000000000..9a7726cf716
--- /dev/null
+++ b/changelogs/unreleased/sh-update-mermaid.yml
@@ -0,0 +1,5 @@
+---
+title: Update Mermaid to 8.1.0
+merge_request: 30036
+author:
+type: fixed
diff --git a/changelogs/unreleased/small-s-in-elasticsearch-in-code.yml b/changelogs/unreleased/small-s-in-elasticsearch-in-code.yml
new file mode 100644
index 00000000000..20d7a822cde
--- /dev/null
+++ b/changelogs/unreleased/small-s-in-elasticsearch-in-code.yml
@@ -0,0 +1,5 @@
+---
+title: Fix typo in code comments about Elasticsearch
+merge_request: 30163
+author: Takuya Noguchi
+type: other
diff --git a/changelogs/unreleased/support-jsonb-default-value.yml b/changelogs/unreleased/support-jsonb-default-value.yml
new file mode 100644
index 00000000000..d46156276f9
--- /dev/null
+++ b/changelogs/unreleased/support-jsonb-default-value.yml
@@ -0,0 +1,5 @@
+---
+title: Support jsonb default in add_column_with_default migration helper
+merge_request: 29871
+author:
+type: other
diff --git a/changelogs/unreleased/transaction-metrics.yml b/changelogs/unreleased/transaction-metrics.yml
new file mode 100644
index 00000000000..8b6e9c7d9d1
--- /dev/null
+++ b/changelogs/unreleased/transaction-metrics.yml
@@ -0,0 +1,5 @@
+---
+title: Adds metrics to measure cost of expensive operations
+merge_request: 29928
+author:
+type: other