GITALY_SERVER_VERSION

-9ff756d21305e63a256ba74c6f75b5c867d9fc22
+88f78ed883808636f3ee02601ee37f944c82b07e

app/assets/javascripts/boards/components/toggle_focus.vue

@@ -20,7 +20,7 @@ export default {
       hide(this.$refs.toggleFocusModeButton);
 
       const issueBoardsContent = document.querySelector('.content-wrapper > .js-focus-mode-board');
-      issueBoardsContent.classList.toggle('is-focused');
+      issueBoardsContent?.classList.toggle('is-focused');
 
       this.isFullscreen = !this.isFullscreen;
     },

app/assets/javascripts/pipelines/pipeline_tabs.js

 import Vue from 'vue';
+import Vuex from 'vuex';
 import VueApollo from 'vue-apollo';
 import PipelineTabs from 'ee_else_ce/pipelines/components/pipeline_tabs.vue';
 import { removeParams, updateHistory } from '~/lib/utils/url_utility';
@@ -7,6 +8,7 @@ import { parseBoolean } from '~/lib/utils/common_utils';
 import { getPipelineDefaultTab, reportToSentry } from './utils';
 
 Vue.use(VueApollo);
+Vue.use(Vuex);
 
 export const createAppOptions = (selector, apolloProvider) => {
   const el = document.querySelector(selector);
@@ -37,6 +39,7 @@ export const createAppOptions = (selector, apolloProvider) => {
       PipelineTabs,
     },
     apolloProvider,
+    store: new Vuex.Store(),
     provide: {
       canGenerateCodequalityReports: parseBoolean(canGenerateCodequalityReports),
       codequalityReportDownloadPath,

app/assets/stylesheets/pages/issuable.scss

@@ -176,11 +176,16 @@
   }
 
   .gutter-toggle {
+    display: flex;
+    align-items: center;
     margin-left: 20px;
-    padding-left: 10px;
+    padding: 4px;
+    border-radius: 4px;
+    height: 24px;
 
     &:hover {
       color: $gl-text-color;
+      background: $gray-50;
     }
 
     &:hover,
@@ -338,7 +343,6 @@
     }
 
     .gutter-toggle {
-      border-left: 1px solid $border-gray-normal;
       text-align: center;
     }
 
@@ -405,8 +409,8 @@
       width: 100%;
       height: $sidebar-toggle-height;
       margin-left: 0;
-      padding-left: 0;
       border-bottom: 1px solid $border-white-normal;
+      border-radius: 0;
     }
 
     a.gutter-toggle {

app/assets/stylesheets/startup/startup-dark.scss

@@ -2,6 +2,9 @@
 // Please see the feedback issue for more details and help:
 // https://gitlab.com/gitlab-org/gitlab/-/issues/331812
 @charset "UTF-8";
+:root {
+  color-scheme: dark;
+}
 body.gl-dark {
   --gray-10: #1f1f1f;
   --gray-50: #303030;
@@ -1714,6 +1717,9 @@ svg.s16 {
 .rect-avatar.s32 {
   border-radius: 4px;
 }
+:root {
+  color-scheme: dark;
+}
 body.gl-dark {
   --gray-10: #1f1f1f;
   --gray-50: #303030;
@@ -1955,6 +1961,9 @@ body.gl-dark .navbar-gitlab .search form .search-input {
   color: var(--gl-text-color);
 }
 
+:root {
+  color-scheme: dark;
+}
 body.gl-dark {
   --gray-10: #1f1f1f;
   --gray-50: #303030;

app/assets/stylesheets/themes/_dark.scss

@@ -101,6 +101,10 @@ $white-dark: #444;
 $border-color: #4f4f4f;
 $nav-active-bg: rgba(255, 255, 255, 0.08);
 
+:root {
+  color-scheme: dark;
+}
+
 body.gl-dark {
   --gray-10: #{$gray-10};
   --gray-50: #{$gray-50};

app/helpers/projects/pipeline_helper.rb

@@ -4,7 +4,7 @@ module Projects
   module PipelineHelper
     extend ::Ci::BuildsHelper
 
-    def js_pipeline_tabs_data(project, pipeline)
+    def js_pipeline_tabs_data(project, pipeline, _user)
       {
         can_generate_codequality_reports: pipeline.can_generate_codequality_reports?.to_json,
         failed_jobs_count: pipeline.failed_builds.count,

app/models/awareness_session.rb

@@ -148,8 +148,13 @@ def users
   end
 
   def users_with_last_activity
-    user_ids, last_activities = user_ids_with_last_activity.transpose
-    users = User.where(id: user_ids)
+    # where in (x, y, [...z]) is a set and does not maintain any order, we need to
+    # make sure to establish a stable order for both, the pairs returned from
+    # redis and the ActiveRecord query. Using IDs in ascending order.
+    user_ids, last_activities = user_ids_with_last_activity
+      .sort_by(&:first)
+      .transpose
+    users = User.where(id: user_ids).order(id: :asc)
     users.zip(last_activities)
   end
 

app/models/user.rb

@@ -1572,6 +1572,10 @@ def following?(user)
     self.followees.exists?(user.id)
   end
 
+  def followed_by?(user)
+    self.followers.include?(user)
+  end
+
   def follow(user)
     return false if self.id == user.id
 

app/views/projects/pipelines/show.html.haml

@@ -27,7 +27,7 @@
       = s_('You can also test your %{gitlab_ci_yml} in %{lint_link_start}CI Lint%{lint_link_end}').html_safe % { gitlab_ci_yml: '.gitlab-ci.yml', lint_link_start: lint_link_start, lint_link_end: '</a>'.html_safe }
 
   - if Feature.enabled?(:pipeline_tabs_vue, @project)
-    #js-pipeline-tabs{ data: js_pipeline_tabs_data(@project, @pipeline) }
+    #js-pipeline-tabs{ data: js_pipeline_tabs_data(@project, @pipeline, @current_user) }
   - else
     = render "projects/pipelines/with_tabs", pipeline: @pipeline, stages: @stages, pipeline_has_errors: pipeline_has_errors
 .js-pipeline-details-vue{ data: { metrics_path: namespace_project_ci_prometheus_metrics_histograms_path(namespace_id: @project.namespace, project_id: @project, format: :json), pipeline_project_path: @project.full_path, pipeline_iid: @pipeline.iid, graphql_resource_etag: graphql_etag_pipeline_path(@pipeline) } }

config/feature_flags/development/batch_load_environment_last_deployment_group.yml

@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/363023
 milestone: '15.1'
 type: development
 group: group::release
-default_enabled: false
+default_enabled: true

config/initializers/doorkeeper.rb

@@ -39,7 +39,7 @@
 
   # Reuse access token for the same resource owner within an application (disabled by default)
   # Rationale: https://github.com/doorkeeper-gem/doorkeeper/issues/383
-  reuse_access_token
+  # reuse_access_token
 
   # Issue access tokens with refresh token (disabled by default)
   use_refresh_token

config/metrics/settings/20210204124922_grafana_link_enabled.yml

@@ -2,9 +2,9 @@
 data_category: optional
 key_path: grafana_link_enabled
 description: Whether Grafana is enabled
-product_section: growth
-product_stage: growth
-product_group: product_intelligence
+product_section: ops
+product_stage: monitor
+product_group: respond
 product_category: collection
 value_type: boolean
 status: active

doc/administration/gitaly/recovery.md

@@ -425,3 +425,21 @@ This command fails if:
 
 - The repository is already being tracked by the Praefect database.
 - The repository does not exist on disk.
+
+### List virtual storage details
+
+> [Introduced](https://gitlab.com/gitlab-org/gitaly/-/merge_requests/4609) in GitLab 15.1.
+
+The `list-storages` Praefect sub-command lists virtual storages and their associated storage nodes. If a virtual storage is:
+
+- Specified using `-virtual-storage`, it lists only storage nodes for the specified virtual storage.
+- Not specified, all virtual storages and their associated storage nodes are listed in tabular format.
+
+```shell
+sudo /opt/gitlab/embedded/bin/praefect -config /var/opt/gitlab/praefect/config.toml list-storages -virtual-storage <virtual_storage_name>
+```
+
+The command outputs:
+
+- Result to `STDOUT` and the command's logs.
+- Errors to `STDERR`.

doc/api/dora/metrics.md

@@ -24,7 +24,7 @@ GET /projects/:id/dora/metrics
 | Attribute            | Type             | Required | Description                                                                                                                                                         |
 |----------------------|------------------|----------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | `id`                 | integer/string   | yes      | The ID or [URL-encoded path of the project](../index.md#namespaced-path-encoding) can be accessed by the authenticated user.                                        |
-| `metric`             | string           | yes      | The metric name: `deployment_frequency`, `lead_time_for_changes` or `time_to_restore_service`.                                                                      |
+| `metric`             | string           | yes      | One of `deployment_frequency`, `lead_time_for_changes`, `time_to_restore_service` or `change_failure_rate`.                                                         |
 | `start_date`         | string           | no       | Date range to start from. ISO 8601 Date format, for example `2021-03-01`. Default is 3 months ago.                                                                  |
 | `end_date`           | string           | no       | Date range to end at. ISO 8601 Date format, for example `2021-03-01`. Default is the current date.                                                                  |
 | `interval`           | string           | no       | The bucketing interval. One of `all`, `monthly` or `daily`. Default is `daily`.                                                                                     |

doc/api/oauth2.md

@@ -15,16 +15,21 @@ To configure GitLab for this, see
 
 This functionality is based on the [doorkeeper Ruby gem](https://github.com/doorkeeper-gem/doorkeeper).
 
-## CORS preflight requests
+## Cross-origin resource sharing
 
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/364680) in GitLab 15.1.
+> CORS preflight request support [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/364680) in GitLab 15.1.
 
-The following endpoints support [CORS preflight requests](https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS):
+Many `/oauth` endpoints support cross-origin resource sharing (CORS). From GitLab 15.1, the following endpoints also
+support [CORS preflight requests](https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS):
 
 - `/oauth/revoke`
 - `/oauth/token`
 - `/oauth/userinfo`
 
+In addition to the headers listed for [simple requests](https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS#simple_requests),
+only the `Authorization` header can be used for preflight requests. For example, the `X-Requested-With` header
+can't be used for preflight requests.
+
 ## Supported OAuth 2.0 flows
 
 GitLab supports the following authorization flows:

doc/ci/pipelines/merged_results_pipelines.md

@@ -6,7 +6,8 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 # Merged results pipelines **(PREMIUM)**
 
-> [Renamed](https://gitlab.com/gitlab-org/gitlab/-/issues/351192) from `pipelines for merged results` to `merged results pipelines` in GitLab 14.8.
+> - [Renamed](https://gitlab.com/gitlab-org/gitlab/-/issues/351192) from `pipelines for merged results` to `merged results pipelines` in GitLab 14.8.
+> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91849) in GitLab 15.1, merged results pipelines also run on [Draft merge requests](../../user/project/merge_requests/drafts.md).
 
 A *merged results pipeline* is a type of [merge request pipeline](merge_request_pipelines.md). It is a pipeline that runs against the results of the source and target branches merged together.
 
@@ -19,10 +20,7 @@ The pipeline runs against the target branch as it exists at the moment you run t
 Over time, while you're working in the source branch, the target branch might change.
 Any time you want to be sure the merged results are accurate, you should re-run the pipeline.
 
-Merged results pipelines can't run when:
-
-- The target branch has changes that conflict with the changes in the source branch.
-- The merge request is a [**Draft** merge request](../../user/project/merge_requests/drafts.md).
+Merged results pipelines can't run when the target branch has changes that conflict with the changes in the source branch.
 
 In these cases, the pipeline runs as a [merge request pipeline](merge_request_pipelines.md)
 and [is labeled as `merge request`](merge_request_pipelines.md#types-of-merge-request-pipelines).

doc/development/import_project.md

@@ -80,6 +80,14 @@ If you're running Omnibus, run the following Rake task:
 gitlab-rake "gitlab:import_export:import[root, group/subgroup, testingprojectimport, /path/to/file.tar.gz]"
 ```
 
+#### Enable verbose output
+
+To make the import Rake task more verbose, use the `IMPORT_DEBUG` environment variable:
+
+```shell
+IMPORT_DEBUG=true gitlab-rake "gitlab:import_export:import[root, group/subgroup, testingprojectimport, /path/to/file.tar.gz]"
+```
+
 #### Troubleshooting
 
 Check the common errors listed below, what they mean, and how to fix them.
@@ -168,6 +176,16 @@ Issue.where(project_id: Project.find(ID).root_namespace.all_projects).maximum(:r
 
 Repeat the import attempt after that and check if the issues are imported successfully.
 
+##### Gitaly calls error when importing
+
+If you're attempting to import a large project into a development environment, you may see Gitaly throw an error about too many calls or invocations, for example:
+
+```plaintext
+Error importing repository into qa-perf-testing/gitlabhq - GitalyClient#call called 31 times from single request. Potential n+1?
+```
+
+This is due to a [n+1 calls limit being set for development setups](gitaly.md#toomanyinvocationserror-errors). You can work around this by setting `GITALY_DISABLE_REQUEST_LIMITS=1` as an environment variable, restarting your development environment and importing again.
+
 ### Importing via the Rails console
 
 The last option is to import a project using a Rails console:
@@ -241,20 +259,6 @@ You can execute the script from the `gdk/gitlab` directory like this:
 bundle exec rails r  /path_to_script/script.rb project_name /path_to_extracted_project request_store_enabled
 ```
 
-## Troubleshooting
-
-This section details known issues we've seen when trying to import a project and how to manage them.
-
-### Gitaly calls error when importing
-
-If you're attempting to import a large project into a development environment, you may see Gitaly throw an error about too many calls or invocations, for example:
-
-```plaintext
-Error importing repository into qa-perf-testing/gitlabhq - GitalyClient#call called 31 times from single request. Potential n+1?
-```
-
-This is due to a [n+1 calls limit being set for development setups](gitaly.md#toomanyinvocationserror-errors). You can work around this by setting `GITALY_DISABLE_REQUEST_LIMITS=1` as an environment variable, restarting your development environment and importing again.
-
 ## Access token setup
 
 Many of the tests also require a GitLab Personal Access Token. This is due to numerous endpoints themselves requiring authentication.

doc/gitlab-basics/create-branch.md

----
-redirect_to: '../tutorials/make_your_first_git_commit.md'
-remove_date: '2022-06-26'
----
-
-This document was moved to [another location](../tutorials/make_your_first_git_commit.md).
-
-<!-- This redirect file can be deleted after <YYYY-MM-DD>. -->
-<!-- Redirects that point to other docs in the same project expire in three months. -->
-<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->
\ No newline at end of file

doc/user/compliance/compliance_report/index.md

@@ -96,7 +96,7 @@ Our criteria for the separation of duties is as follows:
 
 The Chain of Custody report allows customers to export a list of merge commits within the group.
 The data provides a comprehensive view with respect to merge commits. It includes the merge commit SHA,
-merge request author, merge request ID, merge user, pipeline ID, group name, project name, and merge request approvers.
+merge request author, merge request ID, merge user, date merged, pipeline ID, group name, project name, and merge request approvers.
 Depending on the merge strategy, the merge commit SHA can be a merge commit, squash commit, or a diff head commit.
 
 To download the Chain of Custody report: