Add latest changes from gitlab-org/gitlab@master

11 files changed, 323 insertions, 322 deletions

diff --git a/app/assets/javascripts/pages/users/activity_calendar.js b/app/assets/javascripts/pages/users/activity_calendar.js
index e8ffa81654c..fb761725c43 100644
--- a/app/assets/javascripts/pages/users/activity_calendar.js
+++ b/app/assets/javascripts/pages/users/activity_calendar.js
@@ -151,7 +151,7 @@ export default class ActivityCalendar {
       .select(container)
       .append('svg')
       .attr('width', width)
-      .attr('height', 167)
+      .attr('height', 169)
       .attr('class', 'contrib-calendar');
   }
 
diff --git a/app/assets/stylesheets/components/batch_comments/review_bar.scss b/app/assets/stylesheets/components/batch_comments/review_bar.scss
deleted file mode 100644
index 5e1128dc4ce..00000000000
--- a/app/assets/stylesheets/components/batch_comments/review_bar.scss
+++ /dev/null
@@ -1,71 +0,0 @@
-.review-bar-component {
-  position: fixed;
-  bottom: 0;
-  left: 0;
-  z-index: $zindex-dropdown-menu;
-  display: flex;
-  align-items: center;
-  width: 100%;
-  height: $toggle-sidebar-height;
-  padding-left: $contextual-sidebar-width;
-  padding-right: $gutter_collapsed_width;
-  background: $white;
-  border-top: 1px solid $border-color;
-  transition: padding $gl-transition-duration-medium;
-
-  .page-with-icon-sidebar & {
-    padding-left: $contextual-sidebar-collapsed-width;
-  }
-
-  .right-sidebar-expanded & {
-    padding-right: $gutter_width;
-  }
-
-  @media (max-width: map-get($grid-breakpoints, sm)-1) {
-    padding-left: 0;
-    padding-right: 0;
-  }
-
-  .dropdown {
-    margin-left: $grid-size;
-  }
-}
-
-.review-bar-content {
-  max-width: $limited-layout-width;
-  padding: 0 $gl-padding;
-  width: 100%;
-  margin: 0 auto;
-}
-
-.review-preview-item-header {
-  display: flex;
-  align-items: center;
-  width: 100%;
-  margin-bottom: 4px;
-
-  > .bold {
-    display: flex;
-    min-width: 0;
-    line-height: 16px;
-  }
-}
-
-.review-preview-item-footer {
-  display: flex;
-  align-items: center;
-  margin-top: 4px;
-}
-
-.review-preview-item-content {
-  width: 100%;
-
-  p {
-    display: block;
-    width: 100%;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    margin-bottom: 0;
-  }
-}
diff --git a/app/assets/stylesheets/framework.scss b/app/assets/stylesheets/framework.scss
index e977fb92928..a89bd6f834b 100644
--- a/app/assets/stylesheets/framework.scss
+++ b/app/assets/stylesheets/framework.scss
@@ -54,7 +54,6 @@
 @import 'framework/emojis';
 @import 'framework/icons';
 @import 'framework/snippets';
-@import 'framework/memory_graph';
 @import 'framework/responsive_tables';
 @import 'framework/stacked_progress_bar';
 @import 'framework/sortable';
diff --git a/app/assets/stylesheets/framework/calendar.scss b/app/assets/stylesheets/framework/calendar.scss
index b1e5ca50a8b..e69d7b4462d 100644
--- a/app/assets/stylesheets/framework/calendar.scss
+++ b/app/assets/stylesheets/framework/calendar.scss
@@ -1,9 +1,17 @@
 .user-contrib-cell {
+  stroke: $t-gray-a-08;
+
   &:hover {
     cursor: pointer;
     stroke: $black;
   }
 
+  &:focus {
+    @include gl-outline-none;
+    stroke: $white;
+    filter: drop-shadow(1px 0 0.5px $blue-400) drop-shadow(0 1px 0.5px $blue-400) drop-shadow(-1px 0 0.5px $blue-400) drop-shadow(0 -1px 0.5px $blue-400);
+  }
+
   // `app/assets/javascripts/pages/users/activity_calendar.js` sets this attribute
   @for $i from 1 through length($calendar-activity-colors) {
     $color: nth($calendar-activity-colors, $i);
diff --git a/app/assets/stylesheets/framework/diffs.scss b/app/assets/stylesheets/framework/diffs.scss
index 593e643ff3e..f7cd5d7e183 100644
--- a/app/assets/stylesheets/framework/diffs.scss
+++ b/app/assets/stylesheets/framework/diffs.scss
@@ -578,82 +578,6 @@ table.code {
   }
 }
 
-// Merge request diff grid layout
-.diff-grid {
-  .diff-td {
-    // By default min-width is auto with 1fr which causes some overflow problems
-    // https://gitlab.com/gitlab-org/gitlab/-/issues/296222
-    min-width: 0;
-  }
-
-  .diff-grid-row {
-    display: grid;
-    grid-template-columns: 1fr 1fr;
-
-    &.diff-grid-row-full {
-      grid-template-columns: 1fr;
-    }
-  }
-
-  .diff-grid-left,
-  .diff-grid-right {
-    display: grid;
-    // Zero width column is a placeholder for the EE inline code quality diff
-    // see ee/.../diffs.scss for more details
-    grid-template-columns: 50px 8px 0 1fr;
-  }
-
-  .diff-grid-2-col {
-    grid-template-columns: 100px 1fr !important;
-
-    &.parallel {
-      grid-template-columns: 50px 1fr !important;
-    }
-  }
-
-  .diff-grid-comments {
-    display: grid;
-    grid-template-columns: 1fr 1fr;
-  }
-
-  .diff-grid-drafts {
-    display: grid;
-    grid-template-columns: 1fr 1fr;
-
-    .content + .content {
-      @include gl-border-t;
-    }
-  }
-
-  &.inline-diff-view {
-    .diff-grid-comments {
-      display: grid;
-      grid-template-columns: 1fr;
-    }
-
-    .diff-grid-drafts {
-      display: grid;
-      grid-template-columns: 1fr;
-    }
-
-    .diff-grid-row {
-      grid-template-columns: 1fr;
-    }
-
-    .diff-grid-left,
-    .diff-grid-right {
-      // Zero width column is a placeholder for the EE inline code quality diff
-      // see ee/../diffs.scss for more details
-      grid-template-columns: 50px 50px 8px 0 1fr;
-    }
-  }
-}
-
-// Merge request diff grid layout overrides
-.diff-table.code .diff-tr.line_holder .diff-td.line_content.parallel {
-  width: unset;
-}
-
 .diff-stats {
   align-items: center;
   padding: 0 1rem;
@@ -734,68 +658,6 @@ table.code {
   }
 }
 
-.diff-comment-avatar-holders {
-  position: absolute;
-  margin-left: -$gl-padding;
-  z-index: 100;
-  @include code-icon-size();
-
-  &:hover {
-    .diff-comment-avatar,
-    .diff-comments-more-count {
-      @for $i from 1 through 4 {
-        $x-pos: 14px;
-
-        &:nth-child(#{$i}) {
-          @if $i == 4 {
-            $x-pos: 14.5px;
-          }
-
-          transform: translateX((($i * $x-pos) - $x-pos));
-
-          &:hover {
-            transform: translateX((($i * $x-pos) - $x-pos));
-          }
-        }
-      }
-    }
-
-    .diff-comments-more-count {
-      padding-left: 2px;
-      padding-right: 2px;
-      width: auto;
-    }
-  }
-}
-
-.diff-comment-avatar,
-.diff-comments-more-count {
-  position: absolute;
-  left: 0;
-  margin-right: 0;
-  border-color: $white;
-  cursor: pointer;
-  transition: all 0.1s ease-out;
-  @include code-icon-size();
-
-  @for $i from 1 through 4 {
-    &:nth-child(#{$i}) {
-      z-index: (4 - $i);
-    }
-  }
-
-  .avatar {
-    @include code-icon-size();
-  }
-}
-
-.diff-comments-more-count {
-  padding-left: 0;
-  padding-right: 0;
-  overflow: hidden;
-  @include code-icon-size();
-}
-
 .diff-comments-more-count,
 .diff-notes-collapse,
 .diff-codequality-collapse {
@@ -871,70 +733,6 @@ table.code {
   }
 }
 
-
-.diff-file-changes {
-  max-width: 560px;
-  width: 100%;
-  z-index: 150;
-  min-height: $dropdown-min-height;
-  max-height: $dropdown-max-height;
-  overflow-y: auto;
-  margin-bottom: 0;
-
-  @include media-breakpoint-up(sm) {
-    left: $gl-padding;
-  }
-
-  .dropdown-input .dropdown-input-search {
-    pointer-events: all;
-  }
-
-  .diff-changed-file {
-    display: flex;
-    padding-top: 8px;
-    padding-bottom: 8px;
-    min-width: 0;
-  }
-
-  .diff-file-changed-icon {
-    margin-top: 2px;
-  }
-
-  .diff-changed-file-content {
-    display: flex;
-    flex-direction: column;
-    min-width: 0;
-  }
-
-  .diff-changed-file-name,
-  .diff-changed-blank-file-name {
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-  }
-
-  .diff-changed-blank-file-name {
-    color: $gl-text-color-tertiary;
-    font-style: italic;
-  }
-
-  .diff-changed-file-path {
-    color: $gl-text-color-tertiary;
-  }
-
-  .diff-changed-stats {
-    margin-left: auto;
-    white-space: nowrap;
-  }
-}
-
-.diff-file-changes-path {
-  flex: 1;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
 .note-container {
   background-color: $gray-light;
   border-top: 1px solid $white-normal;
@@ -1011,31 +809,6 @@ table.code {
   }
 }
 
-// Notes tweaks for the Changes tab ONLY
-.diff-tr {
-  .timeline-discussion-body {
-    clear: left;
-
-    .note-body {
-      padding: 0 0 $gl-padding-8;
-    }
-  }
-
-  .timeline-entry img.avatar {
-    margin-top: -2px;
-    margin-right: $gl-padding-8;
-  }
-
-  // tiny adjustment to vertical align with the note header text
-  .discussion-collapsible {
-    margin-left: 1rem;
-
-    .timeline-icon {
-      padding-top: 2px;
-    }
-  }
-}
-
 .files:not([data-can-create-note]) .frame {
   cursor: auto;
 }
@@ -1203,13 +976,6 @@ table.code {
   bottom: 100vh;
 }
 
-.diff-line-expand-button {
-  &:hover,
-  &:focus {
-    @include gl-bg-gray-200;
-  }
-}
-
 .diff-grid-row.expansion.match {
   border-top: 1px solid var(--diff-expansion-background-color);
   border-bottom: 1px solid var(--diff-expansion-background-color);
diff --git a/app/assets/stylesheets/framework/memory_graph.scss b/app/assets/stylesheets/framework/memory_graph.scss
deleted file mode 100644
index 510969e149a..00000000000
--- a/app/assets/stylesheets/framework/memory_graph.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-.memory-graph-container {
-  background: $white;
-  border: 1px solid $gray-100;
-}
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index 0bca7ffb539..deb22519ba1 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -709,11 +709,11 @@ $job-arrow-margin: 55px;
  */
 // See https://gitlab.com/gitlab-org/gitlab/-/issues/332150 to align with Pajamas Design System
 $calendar-activity-colors: (
-  #ededed,
-  #acd5f2,
-  #7fa8c9,
-  #527ba0,
-  #254e77,
+  #f5f5f5,
+  #d4dcfa,
+  #748eff,
+  #3547de,
+  #11118a,
 ) !default;
 
 /*
diff --git a/app/assets/stylesheets/page_bundles/merge_requests.scss b/app/assets/stylesheets/page_bundles/merge_requests.scss
index 7bef2934371..050cc2a9fa8 100644
--- a/app/assets/stylesheets/page_bundles/merge_requests.scss
+++ b/app/assets/stylesheets/page_bundles/merge_requests.scss
@@ -9,6 +9,124 @@ $tabs-holder-z-index: 250;
   min-width: 0;
 }
 
+.diff-comment-avatar-holders {
+  position: absolute;
+  margin-left: -$gl-padding;
+  z-index: 100;
+  @include code-icon-size();
+
+  &:hover {
+    .diff-comment-avatar,
+    .diff-comments-more-count {
+      @for $i from 1 through 4 {
+        $x-pos: 14px;
+
+        &:nth-child(#{$i}) {
+          @if $i == 4 {
+            $x-pos: 14.5px;
+          }
+
+          transform: translateX((($i * $x-pos) - $x-pos));
+
+          &:hover {
+            transform: translateX((($i * $x-pos) - $x-pos));
+          }
+        }
+      }
+    }
+
+    .diff-comments-more-count {
+      padding-left: 2px;
+      padding-right: 2px;
+      width: auto;
+    }
+  }
+}
+
+.diff-comment-avatar,
+.diff-comments-more-count {
+  position: absolute;
+  left: 0;
+  margin-right: 0;
+  border-color: var(--white, $white);
+  cursor: pointer;
+  transition: all 0.1s ease-out;
+  @include code-icon-size();
+
+  @for $i from 1 through 4 {
+    &:nth-child(#{$i}) {
+      z-index: (4 - $i);
+    }
+  }
+
+  .avatar {
+    @include code-icon-size();
+  }
+}
+
+.diff-comments-more-count {
+  padding-left: 0;
+  padding-right: 0;
+  overflow: hidden;
+  @include code-icon-size();
+}
+
+.diff-file-changes {
+  max-width: 560px;
+  width: 100%;
+  z-index: 150;
+  min-height: $dropdown-min-height;
+  max-height: $dropdown-max-height;
+  overflow-y: auto;
+  margin-bottom: 0;
+
+  @include media-breakpoint-up(sm) {
+    left: $gl-padding;
+  }
+
+  .dropdown-input .dropdown-input-search {
+    pointer-events: all;
+  }
+
+  .diff-changed-file {
+    display: flex;
+    padding-top: 8px;
+    padding-bottom: 8px;
+    min-width: 0;
+  }
+
+  .diff-file-changed-icon {
+    margin-top: 2px;
+  }
+
+  .diff-changed-file-content {
+    display: flex;
+    flex-direction: column;
+    min-width: 0;
+  }
+
+  .diff-changed-file-name,
+  .diff-changed-blank-file-name {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+
+  .diff-changed-blank-file-name {
+    color: var(--gray-400, $gray-400);
+    font-style: italic;
+  }
+
+  .diff-changed-file-path {
+    color: var(--gray-400, $gray-400);
+  }
+
+  .diff-changed-stats {
+    margin-left: auto;
+    white-space: nowrap;
+  }
+}
+
 .diff-files-holder {
   flex: 1;
   min-width: 0;
@@ -19,6 +137,111 @@ $tabs-holder-z-index: 250;
   }
 }
 
+.diff-grid {
+  .diff-td {
+    // By default min-width is auto with 1fr which causes some overflow problems
+    // https://gitlab.com/gitlab-org/gitlab/-/issues/296222
+    min-width: 0;
+  }
+
+  .diff-grid-row {
+    display: grid;
+    grid-template-columns: 1fr 1fr;
+
+    &.diff-grid-row-full {
+      grid-template-columns: 1fr;
+    }
+  }
+
+  .diff-grid-left,
+  .diff-grid-right {
+    display: grid;
+    // Zero width column is a placeholder for the EE inline code quality diff
+    // see ee/.../diffs.scss for more details
+    grid-template-columns: 50px 8px 0 1fr;
+  }
+
+  .diff-grid-2-col {
+    grid-template-columns: 100px 1fr !important;
+
+    &.parallel {
+      grid-template-columns: 50px 1fr !important;
+    }
+  }
+
+  .diff-grid-comments {
+    display: grid;
+    grid-template-columns: 1fr 1fr;
+  }
+
+  .diff-grid-drafts {
+    display: grid;
+    grid-template-columns: 1fr 1fr;
+
+    .content + .content {
+      @include gl-border-t;
+    }
+  }
+
+  &.inline-diff-view {
+    .diff-grid-comments {
+      display: grid;
+      grid-template-columns: 1fr;
+    }
+
+    .diff-grid-drafts {
+      display: grid;
+      grid-template-columns: 1fr;
+    }
+
+    .diff-grid-row {
+      grid-template-columns: 1fr;
+    }
+
+    .diff-grid-left,
+    .diff-grid-right {
+      // Zero width column is a placeholder for the EE inline code quality diff
+      // see ee/../diffs.scss for more details
+      grid-template-columns: 50px 50px 8px 0 1fr;
+    }
+  }
+}
+
+.diff-line-expand-button {
+  &:hover,
+  &:focus {
+    background-color: var(--gray-200, $gray-200);
+  }
+}
+
+.diff-table.code .diff-tr.line_holder .diff-td.line_content.parallel {
+  width: unset;
+}
+
+.diff-tr {
+  .timeline-discussion-body {
+    clear: left;
+
+    .note-body {
+      padding: 0 0 $gl-padding-8;
+    }
+  }
+
+  .timeline-entry img.avatar {
+    margin-top: -2px;
+    margin-right: $gl-padding-8;
+  }
+
+  // tiny adjustment to vertical align with the note header text
+  .discussion-collapsible {
+    margin-left: 1rem;
+
+    .timeline-icon {
+      padding-top: 2px;
+    }
+  }
+}
+
 .with-system-header {
   --system-header-height: #{$system-header-height};
 }
@@ -858,3 +1081,80 @@ $tabs-holder-z-index: 250;
 .mr-widget-content-row:first-child {
   border-top: 0;
 }
+
+.memory-graph-container {
+  background: var(--white, $white);
+  border: 1px solid var(--gray-100, $gray-100);
+}
+
+.review-bar-component {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  z-index: $zindex-dropdown-menu;
+  display: flex;
+  align-items: center;
+  width: 100%;
+  height: $toggle-sidebar-height;
+  padding-left: $contextual-sidebar-width;
+  padding-right: $gutter_collapsed_width;
+  background: var(--white, $white);
+  border-top: 1px solid var(--border-color, $border-color);
+  transition: padding $gl-transition-duration-medium;
+
+  .page-with-icon-sidebar & {
+    padding-left: $contextual-sidebar-collapsed-width;
+  }
+
+  .right-sidebar-expanded & {
+    padding-right: $gutter_width;
+  }
+
+  @media (max-width: map-get($grid-breakpoints, sm)-1) {
+    padding-left: 0;
+    padding-right: 0;
+  }
+
+  .dropdown {
+    margin-left: $grid-size;
+  }
+}
+
+.review-bar-content {
+  max-width: $limited-layout-width;
+  padding: 0 $gl-padding;
+  width: 100%;
+  margin: 0 auto;
+}
+
+.review-preview-item-header {
+  display: flex;
+  align-items: center;
+  width: 100%;
+  margin-bottom: 4px;
+
+  > .bold {
+    display: flex;
+    min-width: 0;
+    line-height: 16px;
+  }
+}
+
+.review-preview-item-footer {
+  display: flex;
+  align-items: center;
+  margin-top: 4px;
+}
+
+.review-preview-item-content {
+  width: 100%;
+
+  p {
+    display: block;
+    width: 100%;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    margin-bottom: 0;
+  }
+}
diff --git a/app/assets/stylesheets/themes/_dark.scss b/app/assets/stylesheets/themes/_dark.scss
index 4b74e449e06..8e8cabbe511 100644
--- a/app/assets/stylesheets/themes/_dark.scss
+++ b/app/assets/stylesheets/themes/_dark.scss
@@ -269,9 +269,9 @@ $well-expand-item: $gray-200;
 $well-inner-border: $gray-200;
 
 $calendar-activity-colors: (
-  #303030,
-  #333861,
-  #4a5593,
-  #6172c5,
-  #788ff7
+  #404040,
+  #1e23a8,
+  #445cf2,
+  #97acff,
+  #e9ebff
 );
diff --git a/app/finders/packages/helm/packages_finder.rb b/app/finders/packages/helm/packages_finder.rb
index c58d9292e9f..e1b831ca864 100644
--- a/app/finders/packages/helm/packages_finder.rb
+++ b/app/finders/packages/helm/packages_finder.rb
@@ -5,7 +5,7 @@ module Packages
     class PackagesFinder
       include ::Packages::FinderHelper
 
-      MAX_PACKAGES_COUNT = 300
+      MAX_PACKAGES_COUNT = 1000
 
       def initialize(project, channel)
         @project = project
diff --git a/app/models/diff_viewer/server_side.rb b/app/models/diff_viewer/server_side.rb
index 0877c9dddec..a1defb2594f 100644
--- a/app/models/diff_viewer/server_side.rb
+++ b/app/models/diff_viewer/server_side.rb
@@ -10,6 +10,9 @@ module DiffViewer
     end
 
     def prepare!
+      return if Feature.enabled?(:disable_load_entire_blob_for_diff_viewer, diff_file.repository.project)
+
+      # TODO: remove this after resolving #342703
       diff_file.old_blob&.load_all_data!
       diff_file.new_blob&.load_all_data!
     end