From 190ad3b2378ee3d45ae34376ad96b00fdf46f8b3 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Wed, 1 Jun 2022 03:09:43 +0000
Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master

---
 .../components/path_navigation.vue            | 11 +++------
 .../components/merge_conflict_warning.vue     |  4 ++--
 .../runner/components/runner_projects.vue     |  8 ++++---
 app/assets/stylesheets/framework/buttons.scss | 19 +++++++++++++++
 config/metrics/aggregates/code_review.yml     |  2 ++
 doc/update/zero_downtime.md                   | 23 ++++++++++++++++++-
 doc/user/admin_area/license_file.md           |  2 ++
 .../cycle_analytics/path_navigation_spec.js   |  6 ++---
 .../runner/components/runner_projects_spec.js |  4 ++--
 .../code_review_events_spec.rb                |  1 +
 10 files changed, 61 insertions(+), 19 deletions(-)

diff --git a/app/assets/javascripts/cycle_analytics/components/path_navigation.vue b/app/assets/javascripts/cycle_analytics/components/path_navigation.vue
index af7334ecf2e..72a7659aac0 100644
--- a/app/assets/javascripts/cycle_analytics/components/path_navigation.vue
+++ b/app/assets/javascripts/cycle_analytics/components/path_navigation.vue
@@ -1,10 +1,5 @@
 <script>
-import {
-  GlPath,
-  GlPopover,
-  GlDeprecatedSkeletonLoading as GlSkeletonLoading,
-  GlSafeHtmlDirective as SafeHtml,
-} from '@gitlab/ui';
+import { GlPath, GlPopover, GlSkeletonLoader, GlSafeHtmlDirective as SafeHtml } from '@gitlab/ui';
 import Tracking from '~/tracking';
 import { OVERVIEW_STAGE_ID } from '../constants';
 import FormattedStageCount from './formatted_stage_count.vue';
@@ -13,7 +8,7 @@ export default {
   name: 'PathNavigation',
   components: {
     GlPath,
-    GlSkeletonLoading,
+    GlSkeletonLoader,
     GlPopover,
     FormattedStageCount,
   },
@@ -57,7 +52,7 @@ export default {
 };
 </script>
 <template>
-  <gl-skeleton-loading v-if="loading" :lines="2" />
+  <gl-skeleton-loader v-if="loading" :width="235" :lines="2" />
   <gl-path v-else :key="selectedStage.id" :items="stages" @selected="onSelectStage">
     <template #default="{ pathItem, pathId }">
       <gl-popover
diff --git a/app/assets/javascripts/diffs/components/merge_conflict_warning.vue b/app/assets/javascripts/diffs/components/merge_conflict_warning.vue
index 6e1e6f5c2d0..c37a1d75650 100644
--- a/app/assets/javascripts/diffs/components/merge_conflict_warning.vue
+++ b/app/assets/javascripts/diffs/components/merge_conflict_warning.vue
@@ -44,8 +44,8 @@ export default {
         <gl-button
           v-if="resolutionPath"
           :href="resolutionPath"
-          variant="info"
-          class="gl-mr-5 gl-alert-action"
+          variant="confirm"
+          class="gl-mr-3 gl-alert-action"
         >
           {{ __('Resolve conflicts') }}
         </gl-button>
diff --git a/app/assets/javascripts/runner/components/runner_projects.vue b/app/assets/javascripts/runner/components/runner_projects.vue
index daca718e2b5..c0c0c14e91e 100644
--- a/app/assets/javascripts/runner/components/runner_projects.vue
+++ b/app/assets/javascripts/runner/components/runner_projects.vue
@@ -1,5 +1,5 @@
 <script>
-import { GlDeprecatedSkeletonLoading as GlSkeletonLoading } from '@gitlab/ui';
+import { GlSkeletonLoader } from '@gitlab/ui';
 import { sprintf, formatNumber } from '~/locale';
 import { createAlert } from '~/flash';
 import runnerProjectsQuery from '../graphql/show/runner_projects.query.graphql';
@@ -17,7 +17,7 @@ import RunnerPagination from './runner_pagination.vue';
 export default {
   name: 'RunnerProjects',
   components: {
-    GlSkeletonLoading,
+    GlSkeletonLoader,
     RunnerAssignedItem,
     RunnerPagination,
   },
@@ -86,7 +86,9 @@ export default {
       {{ heading }}
     </h3>
 
-    <gl-skeleton-loading v-if="loading" class="gl-py-5" />
+    <div v-if="loading" class="gl-py-5">
+      <gl-skeleton-loader />
+    </div>
     <template v-else-if="projects.items.length">
       <runner-assigned-item
         v-for="(project, i) in projects.items"
diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss
index f951b663cb7..13db3677cab 100644
--- a/app/assets/stylesheets/framework/buttons.scss
+++ b/app/assets/stylesheets/framework/buttons.scss
@@ -411,3 +411,22 @@ copy-code {
     @include gl-opacity-10;
   }
 }
+
+.btn-link {
+  padding: 0;
+  background-color: transparent;
+  color: $blue-600;
+  font-weight: normal;
+  border-radius: 0;
+  border-color: transparent;
+  border-width: 0;
+
+  &:hover,
+  &:active,
+  &:focus {
+    color: $blue-800;
+    text-decoration: underline;
+    background-color: transparent;
+    border-color: transparent;
+  }
+}
diff --git a/config/metrics/aggregates/code_review.yml b/config/metrics/aggregates/code_review.yml
index f6ed93c650e..2a58540f348 100644
--- a/config/metrics/aggregates/code_review.yml
+++ b/config/metrics/aggregates/code_review.yml
@@ -1,3 +1,5 @@
+# NOTE: Please read the following to check if and which aggregate the metric should be added to.
+#
 # code_review_extension_category_monthly_active_users
 # This is only metrics related to the VS Code Extension for now.
 #
diff --git a/doc/update/zero_downtime.md b/doc/update/zero_downtime.md
index 9766ab87b8b..2da5df09d31 100644
--- a/doc/update/zero_downtime.md
+++ b/doc/update/zero_downtime.md
@@ -182,7 +182,28 @@ load balancer to latest GitLab version.
 Gitaly and the Praefect component. It has its own PostgreSQL database, independent of the rest of
 the application.
 
-Before you update the main application you need to update Praefect.
+Before you update the main GitLab application you need to update the Gitaly nodes
+and then Praefect.
+
+**Gitaly nodes**
+
+Upgrade the Gitaly nodes in your Gitaly cluster one at a time
+to ensure access to Git repositories is maintained.
+
+Update the GitLab package:
+
+```shell
+# Debian/Ubuntu
+sudo apt-get update && sudo apt-get install gitlab-ee
+
+# Centos/RHEL
+sudo yum install gitlab-ee
+```
+
+If you are a Community Edition user, replace `gitlab-ee` with `gitlab-ce` in the above command.
+
+**Praefect**
+
 Out of your Praefect nodes, pick one to be your Praefect deploy node.
 This is where you install the new Omnibus package first and run
 database migrations.
diff --git a/doc/user/admin_area/license_file.md b/doc/user/admin_area/license_file.md
index ff9e87680f9..146e4339828 100644
--- a/doc/user/admin_area/license_file.md
+++ b/doc/user/admin_area/license_file.md
@@ -4,6 +4,8 @@ group: Provision
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
 ---
 
+<!-- To promote the workflow described in license.md, this page is not included in global left nav. -->
+
 # Activate GitLab EE with a license file or key
 
 If you receive a license file from GitLab (for example, for a trial), you can
diff --git a/spec/frontend/cycle_analytics/path_navigation_spec.js b/spec/frontend/cycle_analytics/path_navigation_spec.js
index c6d72d3b571..e8c4ebd3a38 100644
--- a/spec/frontend/cycle_analytics/path_navigation_spec.js
+++ b/spec/frontend/cycle_analytics/path_navigation_spec.js
@@ -1,4 +1,4 @@
-import { GlPath, GlDeprecatedSkeletonLoading as GlSkeletonLoading } from '@gitlab/ui';
+import { GlPath, GlSkeletonLoader } from '@gitlab/ui';
 import { mount } from '@vue/test-utils';
 import { mockTracking, unmockTracking } from 'helpers/tracking_helper';
 import { extendedWrapper } from 'helpers/vue_test_utils_helper';
@@ -73,7 +73,7 @@ describe('Project PathNavigation', () => {
         });
 
         it('hides the gl-skeleton-loading component', () => {
-          expect(wrapper.find(GlSkeletonLoading).exists()).toBe(false);
+          expect(wrapper.find(GlSkeletonLoader).exists()).toBe(false);
         });
 
         it('renders each stage', () => {
@@ -116,7 +116,7 @@ describe('Project PathNavigation', () => {
         });
 
         it('displays the gl-skeleton-loading component', () => {
-          expect(wrapper.find(GlSkeletonLoading).exists()).toBe(true);
+          expect(wrapper.find(GlSkeletonLoader).exists()).toBe(true);
         });
       });
     });
diff --git a/spec/frontend/runner/components/runner_projects_spec.js b/spec/frontend/runner/components/runner_projects_spec.js
index 04627e2307b..6932b3b5197 100644
--- a/spec/frontend/runner/components/runner_projects_spec.js
+++ b/spec/frontend/runner/components/runner_projects_spec.js
@@ -1,4 +1,4 @@
-import { GlDeprecatedSkeletonLoading as GlSkeletonLoading } from '@gitlab/ui';
+import { GlSkeletonLoader } from '@gitlab/ui';
 import Vue from 'vue';
 import VueApollo from 'vue-apollo';
 import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
@@ -34,7 +34,7 @@ describe('RunnerProjects', () => {
   let mockRunnerProjectsQuery;
 
   const findHeading = () => wrapper.find('h3');
-  const findGlSkeletonLoading = () => wrapper.findComponent(GlSkeletonLoading);
+  const findGlSkeletonLoading = () => wrapper.findComponent(GlSkeletonLoader);
   const findRunnerAssignedItems = () => wrapper.findAllComponents(RunnerAssignedItem);
   const findRunnerPagination = () => wrapper.findComponent(RunnerPagination);
 
diff --git a/spec/lib/gitlab/usage_data_counters/code_review_events_spec.rb b/spec/lib/gitlab/usage_data_counters/code_review_events_spec.rb
index 0d45c4a4352..53a70fcb24f 100644
--- a/spec/lib/gitlab/usage_data_counters/code_review_events_spec.rb
+++ b/spec/lib/gitlab/usage_data_counters/code_review_events_spec.rb
@@ -3,6 +3,7 @@
 require 'spec_helper'
 
 # If this spec fails, we need to add the new code review event to the correct aggregated metric
+# NOTE: ONLY user related metrics to be added to the aggregates - otherwise add it to the exception list
 RSpec.describe 'Code review events' do
   it 'the aggregated metrics contain all the code review metrics' do
     path = Rails.root.join('config/metrics/aggregates/code_review.yml')