From 9643359dd3a54154ecf0cb8efab39599529aa90c Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Thu, 11 May 2023 21:13:01 +0000
Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master

---
 .../components/super_sidebar.vue              | 15 +++++----
 .../stylesheets/framework/super_sidebar.scss  | 10 +++---
 .../stylesheets/framework/variables.scss      |  1 +
 .../16-0-deprecate-postgresql-13.yml          | 29 +++++++++++++++++
 .../performance/grafana_configuration.md      | 31 +++++++++++++++++++
 .../database/database_migration_pipeline.md   |  2 +-
 doc/update/deprecations.md                    | 21 +++++++++++++
 .../merge_when_pipeline_succeeds.md           |  3 ++
 .../project/repository/code_suggestions.md    |  2 +-
 package.json                                  |  4 +--
 yarn.lock                                     | 16 +++++-----
 11 files changed, 110 insertions(+), 24 deletions(-)
 create mode 100644 data/deprecations/16-0-deprecate-postgresql-13.yml

diff --git a/app/assets/javascripts/super_sidebar/components/super_sidebar.vue b/app/assets/javascripts/super_sidebar/components/super_sidebar.vue
index ab1a23021c2..6b1efc4217c 100644
--- a/app/assets/javascripts/super_sidebar/components/super_sidebar.vue
+++ b/app/assets/javascripts/super_sidebar/components/super_sidebar.vue
@@ -98,7 +98,13 @@ export default {
 <template>
   <div>
     <div class="super-sidebar-overlay" @click="collapseSidebar"></div>
-
+    <gl-button
+      class="super-sidebar-skip-to gl-sr-only-focusable gl-fixed gl-left-0 gl-m-3"
+      href="#content-body"
+      variant="confirm"
+    >
+      {{ $options.i18n.skipToMainContent }}
+    </gl-button>
     <aside
       id="super-sidebar"
       class="super-sidebar"
@@ -107,13 +113,6 @@ export default {
       data-qa-selector="navbar"
       :inert="sidebarState.isCollapsed"
     >
-      <gl-button
-        class="super-sidebar-skip-to gl-sr-only-focusable gl-absolute gl-left-3 gl-right-3 gl-top-3"
-        href="#content-body"
-        variant="confirm"
-      >
-        {{ $options.i18n.skipToMainContent }}
-      </gl-button>
       <user-bar :has-collapse-button="!sidebarState.isPeek" :sidebar-data="sidebarData" />
       <div v-if="showTrialStatusWidget" class="gl-px-2 gl-py-2">
         <trial-status-widget
diff --git a/app/assets/stylesheets/framework/super_sidebar.scss b/app/assets/stylesheets/framework/super_sidebar.scss
index 4124f6b46c5..ca67b472322 100644
--- a/app/assets/stylesheets/framework/super_sidebar.scss
+++ b/app/assets/stylesheets/framework/super_sidebar.scss
@@ -22,6 +22,12 @@ $super-sidebar-transition-hint-duration: $super-sidebar-transition-duration / 4;
   transition: background-color 100ms linear, border-color 100ms linear;
 }
 
+.super-sidebar-skip-to {
+  top: calc(#{$header-height} + #{$calc-application-bars-height});
+  width: calc(#{$super-sidebar-width} - #{$gl-spacing-scale-5});
+  z-index: $super-sidebar-skip-to-z-index;
+}
+
 .super-sidebar {
   display: flex;
   flex-direction: column;
@@ -208,10 +214,6 @@ $super-sidebar-transition-hint-duration: $super-sidebar-transition-duration / 4;
   }
 }
 
-.super-sidebar-skip-to {
-  z-index: $super-sidebar-z-index;
-}
-
 .super-sidebar-overlay {
   display: none;
 }
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index 4052227b927..6cf231fbcef 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -12,6 +12,7 @@ $contextual-sidebar-collapsed-width: 56px;
 $toggle-sidebar-height: 48px;
 $super-sidebar-width: 256px;
 $super-sidebar-z-index: 600;
+$super-sidebar-skip-to-z-index: 601;
 $super-sidebar-overlay-z-index: 599;
 $top-bar-z-index: 210;
 
diff --git a/data/deprecations/16-0-deprecate-postgresql-13.yml b/data/deprecations/16-0-deprecate-postgresql-13.yml
new file mode 100644
index 00000000000..779a3074f39
--- /dev/null
+++ b/data/deprecations/16-0-deprecate-postgresql-13.yml
@@ -0,0 +1,29 @@
+- title: "PostgreSQL 13 deprecated"
+  removal_milestone: "17.0"
+  announcement_milestone: "16.0"
+  breaking_change: true
+  reporter: rogerwoo
+  stage: Enablement
+  issue_url: https://gitlab.com/groups/gitlab-org/-/epics/9065
+  body: |
+    GitLab follows an [annual upgrade cadence for PostgreSQL](https://about.gitlab.com/handbook/engineering/development/enablement/data_stores/database/postgresql-upgrade-cadence.html).
+
+    Support for PostgreSQL 13 is scheduled for removal in GitLab 17.0.
+    In GitLab 17.0, PostgreSQL 14 becomes the minimum required PostgreSQL version.
+
+    PostgreSQL 13 will be supported for the full GitLab 16 release cycle.
+    PostgreSQL 14 will also be supported for instances that want to upgrade prior to GitLab 17.0.
+
+# OPTIONAL END OF SUPPORT FIELDS
+#
+# If an End of Support period applies, the announcement should be shared with GitLab Support
+# in the `#spt_managers` channel in Slack, and mention `@gitlab-com/support` in this MR.
+#
+  end_of_support_milestone: 17.0
+  #
+  # OTHER OPTIONAL FIELDS
+  #
+  tiers:  # (optional - may be required in the future) An array of tiers that the feature is available in currently.  e.g., [Free, Silver, Gold, Core, Premium, Ultimate]
+  documentation_url:  # (optional) This is a link to the current documentation page
+  image_url:  # (optional) This is a link to a thumbnail image depicting the feature
+  video_url:  # (optional) Use the youtube thumbnail URL with the structure of https://img.youtube.com/vi/UNIQUEID/hqdefault.jpg
diff --git a/doc/administration/monitoring/performance/grafana_configuration.md b/doc/administration/monitoring/performance/grafana_configuration.md
index 3dec34ebace..1113dcfef32 100644
--- a/doc/administration/monitoring/performance/grafana_configuration.md
+++ b/doc/administration/monitoring/performance/grafana_configuration.md
@@ -6,10 +6,41 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 # Grafana Configuration **(FREE SELF)**
 
+> [Deprecated](https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/7772) in GitLab 16.0.
+
+WARNING:
+Bundled Grafana was deprecated GitLab 16.0 and is no longer supported. It will be removed in GitLab 16.3.
+For more information, see [deprecation notes](#deprecation-of-bundled-grafana).
+
 [Grafana](https://grafana.com/) is a tool that enables you to visualize time
 series metrics through graphs and dashboards. GitLab writes performance data to Prometheus,
 and Grafana allows you to query the data to display useful graphs.
 
+## Deprecation of bundled Grafana
+
+Bundled Grafana was an optional Omnibus GitLab service that provided a user interface to GitLab metrics.
+
+The version of Grafana that is bundled with Omnibus GitLab is no longer supported. If you're using the bundled Grafana, you
+should switch to a newer version from [Grafana Labs](https://grafana.com/grafana/).
+
+### Switch to new Grafana instance
+
+To switch away from bundled Grafana to a newer version of Grafana from Grafana Labs:
+
+1. Set up a version of Grafana from Grafana Labs.
+1. [Export the existing dashboards](https://grafana.com/docs/grafana/latest/dashboards/manage-dashboards/#export-a-dashboard) from bundled Grafana.
+1. [Import the existing dashboards](https://grafana.com/docs/grafana/latest/dashboards/manage-dashboards/#import-a-dashboard) in the new Grafana instance.
+1. [Configure GitLab](#integration-with-gitlab-ui) to use the new Grafana instance.
+
+### Temporary workaround
+
+In GitLab versions 16.0 to 16.2, you can still force Omnibus GitLab to enable and configure Grafana by setting the following:
+
+- `grafana['enable'] = true`.
+- `grafana['enable_deprecated_service'] = true`. 
+ 
+You see a deprecation message when reconfiguring GitLab.
+
 ## Installation
 
 Omnibus GitLab can [help you install Grafana (recommended)](https://docs.gitlab.com/omnibus/settings/grafana.html)
diff --git a/doc/development/database/database_migration_pipeline.md b/doc/development/database/database_migration_pipeline.md
index 2344ee3f942..70f9c1523c0 100644
--- a/doc/development/database/database_migration_pipeline.md
+++ b/doc/development/database/database_migration_pipeline.md
@@ -15,7 +15,7 @@ It is based on an [architecture blueprint](../../architecture/blueprints/databas
 Migration testing is enabled in the [GitLab project](https://gitlab.com/gitlab-org/gitlab)
 for changes that add a new database migration. Trigger this job manually by running the
 `db:gitlabcom-database-testing` job within in `test` stage. To avoid wasting resources,
-only run this job when your MR is ready for review.
+only run this job when your MR is ready for review. Additionally, ensure that the MR has the "database" label for the pipeline to appear in the test stage.
 
 The job starts a pipeline on the [ops GitLab instance](https://ops.gitlab.net/).
 For security reasons, access to the pipeline is restricted to database maintainers.
diff --git a/doc/update/deprecations.md b/doc/update/deprecations.md
index 81195db0781..fdb0d340151 100644
--- a/doc/update/deprecations.md
+++ b/doc/update/deprecations.md
@@ -329,6 +329,27 @@ The [`project_fingerprint`](https://gitlab.com/groups/gitlab-org/-/epics/2791) a
 
 <div class="deprecation breaking-change" data-milestone="17.0">
 
+### PostgreSQL 13 deprecated
+
+<div class="deprecation-notes">
+- Announced in: GitLab <span class="milestone">16.0</span>
+- End of Support: GitLab <span class="milestone">17.0</span>
+- This is a [breaking change](https://docs.gitlab.com/ee/development/deprecation_guidelines/).
+- To discuss this change or learn more, see the [deprecation issue](https://gitlab.com/groups/gitlab-org/-/epics/9065).
+</div>
+
+GitLab follows an [annual upgrade cadence for PostgreSQL](https://about.gitlab.com/handbook/engineering/development/enablement/data_stores/database/postgresql-upgrade-cadence.html).
+
+Support for PostgreSQL 13 is scheduled for removal in GitLab 17.0.
+In GitLab 17.0, PostgreSQL 14 becomes the minimum required PostgreSQL version.
+
+PostgreSQL 13 will be supported for the full GitLab 16 release cycle.
+PostgreSQL 14 will also be supported for instances that want to upgrade prior to GitLab 17.0.
+
+</div>
+
+<div class="deprecation breaking-change" data-milestone="17.0">
+
 ### Queue selector for running Sidekiq is deprecated
 
 <div class="deprecation-notes">
diff --git a/doc/user/project/merge_requests/merge_when_pipeline_succeeds.md b/doc/user/project/merge_requests/merge_when_pipeline_succeeds.md
index 102a2ad1c14..c6fd38e3317 100644
--- a/doc/user/project/merge_requests/merge_when_pipeline_succeeds.md
+++ b/doc/user/project/merge_requests/merge_when_pipeline_succeeds.md
@@ -7,6 +7,9 @@ type: reference, concepts
 
 # Merge when pipeline succeeds **(FREE)**
 
+NOTE:
+[In GitLab 16.0 and later](https://gitlab.com/gitlab-org/gitlab/-/issues/359057), the **Merge when pipeline succeeds** and **Add to merge train when pipeline succeeds** buttons become **Set to auto-merge**.
+
 If you review a merge request and it's ready to merge, but the pipeline hasn't
 completed yet, you can set it to merge when the pipeline succeeds (MWPS). You don't
 have to remember later to merge the work manually:
diff --git a/doc/user/project/repository/code_suggestions.md b/doc/user/project/repository/code_suggestions.md
index 027372eb05d..c64bcdb073c 100644
--- a/doc/user/project/repository/code_suggestions.md
+++ b/doc/user/project/repository/code_suggestions.md
@@ -26,7 +26,7 @@ Code Suggestions are available in Visual Studio Code when you have the GitLab Wo
 
 ## Supported languages
 
-Code Suggestions may produce [low-quality or incomplete suggestions](#model-accuracy-and-quality). The best results from Code Suggestions are expected for these six languages:
+Code Suggestions may produce [low-quality or incomplete suggestions](#model-accuracy-and-quality). The best results from Code Suggestions are expected for these languages:
 
 - C/C++
 - C#
diff --git a/package.json b/package.json
index f605019d248..9b625983758 100644
--- a/package.json
+++ b/package.json
@@ -57,9 +57,9 @@
     "@gitlab/favicon-overlay": "2.0.0",
     "@gitlab/fonts": "^1.2.0",
     "@gitlab/svgs": "3.46.0",
-    "@gitlab/ui": "62.9.2",
+    "@gitlab/ui": "62.10.0",
     "@gitlab/visual-review-tools": "1.7.3",
-    "@gitlab/web-ide": "0.0.1-dev-20230508202052",
+    "@gitlab/web-ide": "0.0.1-dev-20230511143809",
     "@mattiasbuelens/web-streams-adapter": "^0.1.0",
     "@popperjs/core": "^2.11.2",
     "@rails/actioncable": "6.1.4-7",
diff --git a/yarn.lock b/yarn.lock
index 55e29c0dcac..9e80a92792b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1115,10 +1115,10 @@
   resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-3.46.0.tgz#741fea428ce9cac9fd8ccdb65a7b863ab5f7773d"
   integrity sha512-+NEdjNTBCTnJIjQKomf6yasT3ezg8UNBGJVUDf+ZgXgENKbwOjV9ngcVeHQMZM4hDaQSaJx08fagyadCcTw0Ow==
 
-"@gitlab/ui@62.9.2":
-  version "62.9.2"
-  resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-62.9.2.tgz#5b519b403000ab06621fa0a0f0b0d3ae0b3aca8c"
-  integrity sha512-GU69cxqfMa7jSU/ra9OHh38eLuy1tFNl5QZWRZIVU5IjRBZe1CaYVPTzeXQxd5kDOAj0MwtvC0z1XlDz54UMYA==
+"@gitlab/ui@62.10.0":
+  version "62.10.0"
+  resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-62.10.0.tgz#b93b4dca47a8ca0e4f6bf2ab1e49b783c348d27c"
+  integrity sha512-Ektyickh1tem5L7WTWFmmie5T5heQE3TaPj55xqs53nljl92ZHq8za703uINnvE2j2SSuMyRqtAhHjglB+wRmA==
   dependencies:
     "@popperjs/core" "^2.11.2"
     bootstrap-vue "2.23.1"
@@ -1134,10 +1134,10 @@
   resolved "https://registry.yarnpkg.com/@gitlab/visual-review-tools/-/visual-review-tools-1.7.3.tgz#9ea641146436da388ffbad25d7f2abe0df52c235"
   integrity sha512-NMV++7Ew1FSBDN1xiZaauU9tfeSfgDHcOLpn+8bGpP+O5orUPm2Eu66R5eC5gkjBPaXosNAxNWtriee+aFk4+g==
 
-"@gitlab/web-ide@0.0.1-dev-20230508202052":
-  version "0.0.1-dev-20230508202052"
-  resolved "https://registry.yarnpkg.com/@gitlab/web-ide/-/web-ide-0.0.1-dev-20230508202052.tgz#594259f161d4276653fc7f6028465cbd098e6e94"
-  integrity sha512-lTo7JrZqT8CGiNVh2WeJbVKeqT69zlse/0pZVsi5HlfQCFgkIi/M2Sj8cem+1uezBVo2UI2SAA4zXUsmCC4apw==
+"@gitlab/web-ide@0.0.1-dev-20230511143809":
+  version "0.0.1-dev-20230511143809"
+  resolved "https://registry.yarnpkg.com/@gitlab/web-ide/-/web-ide-0.0.1-dev-20230511143809.tgz#c13dfb4d1edab2e020d4a102d4ec18048917490f"
+  integrity sha512-caP5WSaTuIhPrPGUWyvPT4np6swkKQHM1Pa9HiBnGhiOhhQ1+3X/+J9EoZXUhnhwiBzS7sp32Uyttam4am/sTA==
 
 "@graphql-eslint/eslint-plugin@3.18.0":
   version "3.18.0"