Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.eslint_todo/vue-no-unused-properties.mjs

@@ -482,11 +482,6 @@ export default {
     'ee/app/assets/javascripts/vue_merge_request_widget/components/widget/app.vue',
     'ee/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue',
     'ee/app/assets/javascripts/vue_merge_request_widget/widgets/status_checks/index.vue',
-    'ee/app/assets/javascripts/vue_shared/components/code_flow/code_flow_steps_section.vue',
-    'ee/app/assets/javascripts/vue_shared/components/code_flow/vulnerability_code_flow.vue',
-    'ee/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/epic_token.vue',
-    'ee/app/assets/javascripts/vue_shared/discover/card_security_discover_app.vue',
-    'ee/app/assets/javascripts/vue_shared/security_reports/components/security_training_promo.vue',
     'ee/app/assets/javascripts/vulnerabilities/components/header.vue',
     'ee/app/assets/javascripts/vulnerabilities/components/new_vulnerability/section_details.vue',
     'ee/app/assets/javascripts/vulnerabilities/components/vulnerability_details.vue',

.gitlab/ci/rails/shared.gitlab-ci.yml

@@ -109,7 +109,12 @@ include:
     # in unit tests again.
     - rspec_section rspec_parallelized_job "--fail-fast=${RSPEC_FAIL_FAST_THRESHOLD} --tag ~quarantine --tag ~level:background_migration --tag ~click_house"
   after_script:
+    # We need this at the very top, because the section_start/section_end logic is defined there.
     - source scripts/utils.sh
+    - |
+      section_start "failure-analyzer" "Report failure category"
+      tooling/lib/tooling/glci/failure_analyzer.rb $CI_JOB_ID || true
+      section_end "failure-analyzer"
     - log_disk_usage  # https://gitlab.com/gitlab-org/gitlab/-/issues/478880
     - bundle exec gem list gitlab_quality-test_tooling
     - |

.gitlab/issue_templates/Feature Flag Roll Out.md

@@ -1,4 +1,4 @@
-<!-- Title suggestion: [Feature flag] Enable <feature-flag-name> -->
+<!-- Title suggestion: [FF] `<feature-flag-name>` -- <short description> -->
 
 ## Summary
 
@@ -104,7 +104,7 @@ To do so, follow these steps:
 - [ ] Close [the feature issue](<feature-issue-link>) to indicate the feature will be released in the current milestone.
 - [ ] Set the next milestone to this rollout issue for scheduling [the flag removal](#release-the-feature).
 - [ ] (Optional) You can [create a separate issue](https://gitlab.com/gitlab-org/gitlab/-/issues/new?issuable_template=Feature%20Flag%20Cleanup) for scheduling the steps below to [Release the feature](#release-the-feature).
-    - [ ] Set the title to "[Feature flag] Cleanup `<feature-flag-name>`".
+    - [ ] Set the title to "[FF] `<feature-flag-name>` - Cleanup".
     - [ ] Execute the `/copy_metadata <this-rollout-issue-link>` quick action to copy the labels from this rollout issue.
     - [ ] Link this rollout issue as a related issue.
     - [ ] Close this rollout issue.

GITALY_SERVER_VERSION

@@ -1 +1 @@
-a588d34c7e1cc71a5038efa9745ee637b23bf8c7
+d5b6a529fbff95ae2f8479a95ae375abaa497ae1

Gemfile

@@ -602,6 +602,7 @@ group :test do
   gem 'rspec_junit_formatter', feature_category: :shared
   gem 'guard-rspec', feature_category: :shared
   gem 'axe-core-rspec', '~> 4.10.0', feature_category: :tooling
+  gem 'state_machines-rspec', '~> 0.6', feature_category: :shared
 
   # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527
   gem 'derailed_benchmarks', require: false, feature_category: :shared

Gemfile.checksum

@@ -712,6 +712,7 @@
 {"name":"state_machines","version":"0.5.0","platform":"ruby","checksum":"23e6249d374a920b528dccade403518b4abbd83841a3e2c9ef13e6f1a009b102"},
 {"name":"state_machines-activemodel","version":"0.8.0","platform":"ruby","checksum":"e932dab190d4be044fb5f9cab01a3ea0b092c5f113d4676c6c0a0d49bf738d2c"},
 {"name":"state_machines-activerecord","version":"0.8.0","platform":"ruby","checksum":"072fb701b8ab03de0608297f6c55dc34ed096e556fa8f77e556f3c461c71aab6"},
+{"name":"state_machines-rspec","version":"0.6.0","platform":"ruby","checksum":"2ba57a45df57d0c97f79146e2e0f65f519b52e65e182805ef79cb73b1fe5c0bd"},
 {"name":"strings","version":"0.2.1","platform":"ruby","checksum":"933293b3c95cf85b81eb44b3cf673e3087661ba739bbadfeadf442083158d6fb"},
 {"name":"strings-ansi","version":"0.2.0","platform":"ruby","checksum":"90262d760ea4a94cc2ae8d58205277a343409c288cbe7c29416b1826bd511c88"},
 {"name":"swd","version":"2.0.3","platform":"ruby","checksum":"4cdbe2a4246c19f093fce22e967ec3ebdd4657d37673672e621bf0c7eb770655"},

Gemfile.lock

@@ -1827,6 +1827,10 @@ GEM
     state_machines-activerecord (0.8.0)
       activerecord (>= 5.1)
       state_machines-activemodel (>= 0.8.0)
+    state_machines-rspec (0.6.0)
+      activesupport
+      rspec (~> 3.3)
+      state_machines
     strings (0.2.1)
       strings-ansi (~> 0.2)
       unicode-display_width (>= 1.5, < 3.0)
@@ -2337,6 +2341,7 @@ DEPENDENCIES
   ssh_data (~> 1.3)
   stackprof (~> 0.2.26)
   state_machines-activerecord (~> 0.8.0)
+  state_machines-rspec (~> 0.6)
   sys-filesystem (~> 1.4.3)
   tanuki_emoji (~> 0.13)
   telesignenterprise (~> 2.2)

Gemfile.next.checksum

@@ -723,6 +723,7 @@
 {"name":"state_machines","version":"0.5.0","platform":"ruby","checksum":"23e6249d374a920b528dccade403518b4abbd83841a3e2c9ef13e6f1a009b102"},
 {"name":"state_machines-activemodel","version":"0.8.0","platform":"ruby","checksum":"e932dab190d4be044fb5f9cab01a3ea0b092c5f113d4676c6c0a0d49bf738d2c"},
 {"name":"state_machines-activerecord","version":"0.8.0","platform":"ruby","checksum":"072fb701b8ab03de0608297f6c55dc34ed096e556fa8f77e556f3c461c71aab6"},
+{"name":"state_machines-rspec","version":"0.6.0","platform":"ruby","checksum":"2ba57a45df57d0c97f79146e2e0f65f519b52e65e182805ef79cb73b1fe5c0bd"},
 {"name":"stringio","version":"3.1.6","platform":"java","checksum":"dbdb1ee4e6d75782bbc7e8cc7d84cd05e592df50494f363011cc7cd48153bbf7"},
 {"name":"stringio","version":"3.1.6","platform":"ruby","checksum":"292c495d1657adfcdf0a32eecf12a60e6691317a500c3112ad3b2e31068274f5"},
 {"name":"strings","version":"0.2.1","platform":"ruby","checksum":"933293b3c95cf85b81eb44b3cf673e3087661ba739bbadfeadf442083158d6fb"},

Gemfile.next.lock

@@ -1860,6 +1860,10 @@ GEM
     state_machines-activerecord (0.8.0)
       activerecord (>= 5.1)
       state_machines-activemodel (>= 0.8.0)
+    state_machines-rspec (0.6.0)
+      activesupport
+      rspec (~> 3.3)
+      state_machines
     stringio (3.1.6)
     strings (0.2.1)
       strings-ansi (~> 0.2)
@@ -2371,6 +2375,7 @@ DEPENDENCIES
   ssh_data (~> 1.3)
   stackprof (~> 0.2.26)
   state_machines-activerecord (~> 0.8.0)
+  state_machines-rspec (~> 0.6)
   sys-filesystem (~> 1.4.3)
   tanuki_emoji (~> 0.13)
   telesignenterprise (~> 2.2)

app/assets/javascripts/ci/runner/components/runner_delete_button.vue

@@ -72,7 +72,7 @@ export default {
       <gl-button
         v-gl-tooltip="loading ? '' : tooltip"
         :aria-label="ariaLabel"
-        :icon="icon"
+        :icon="loading ? '' : icon"
         :class="buttonClass"
         :loading="loading"
         variant="danger"

app/assets/javascripts/diffs/components/diffs_file_tree.vue

@@ -5,6 +5,7 @@ import PanelResizer from '~/vue_shared/components/panel_resizer.vue';
 import { getCookie, setCookie } from '~/lib/utils/common_utils';
 import * as types from '~/diffs/store/mutation_types';
 import { useLegacyDiffs } from '~/diffs/stores/legacy_diffs';
+import FileBrowserHeight from '~/diffs/components/file_browser_height.vue';
 import {
   INITIAL_TREE_WIDTH,
   MIN_TREE_WIDTH,
@@ -15,7 +16,7 @@ import TreeList from './tree_list.vue';
 
 export default {
   name: 'DiffsFileTree',
-  components: { TreeList, PanelResizer },
+  components: { FileBrowserHeight, TreeList, PanelResizer },
   minTreeWidth: MIN_TREE_WIDTH,
   maxTreeWidth: window.innerWidth / 2,
   props: {
@@ -36,18 +37,13 @@ export default {
     },
   },
   data() {
-    const treeWidth =
-      parseInt(
-        getCookie(TREE_LIST_WIDTH_STORAGE_KEY) || localStorage.getItem(TREE_LIST_WIDTH_STORAGE_KEY),
-        10,
-      ) || INITIAL_TREE_WIDTH;
-
     return {
-      treeWidth,
-      newWidth: null,
-      cachedHeight: null,
-      cachedTop: null,
+      treeWidth: INITIAL_TREE_WIDTH,
+      rowHeight: 0,
       floating: false,
+      newWidth: 0,
+      cachedHeight: 0,
+      cachedTop: 0,
     };
   },
   computed: {
@@ -57,10 +53,12 @@ export default {
     applyNewWidthDebounced() {
       return debounce(this.applyNewWidth, 250);
     },
-    rootStyle() {
+    floatingWrapperStyles() {
+      if (!this.floating) return undefined;
       return {
-        width: `${this.treeWidth}px`,
-        height: this.cachedHeight ? `${this.cachedHeight}px` : undefined,
+        height: `${this.cachedHeight}px`,
+        width: `${this.newWidth}px`,
+        top: `${this.cachedTop}px`,
       };
     },
   },
@@ -69,10 +67,23 @@ export default {
       this.applyNewWidthDebounced();
     },
   },
+  created() {
+    this.restoreTreeWidthUserPreference();
+  },
+  mounted() {
+    const computedStyles = getComputedStyle(this.$refs.root.$el);
+    this.rowHeight = parseInt(computedStyles.getPropertyValue('--file-row-height'), 10);
+  },
   methods: {
     ...mapActions(useLegacyDiffs, {
       setCurrentDiffFile: types.SET_CURRENT_DIFF_FILE,
     }),
+    restoreTreeWidthUserPreference() {
+      const userPreference =
+        getCookie(TREE_LIST_WIDTH_STORAGE_KEY) || localStorage.getItem(TREE_LIST_WIDTH_STORAGE_KEY);
+      if (!userPreference) return;
+      this.treeWidth = parseInt(userPreference, 10);
+    },
     onFileClick(file) {
       this.setCurrentDiffFile(file.fileHash);
       this.$emit('clickFile', file);
@@ -111,19 +122,17 @@ export default {
 </script>
 
 <template>
-  <div
+  <file-browser-height
+    ref="root"
     data-testid="file-browser-tree"
-    :style="rootStyle"
+    :style="{ width: `${treeWidth}px` }"
     class="rd-app-sidebar diff-tree-list"
     :class="{ 'diff-tree-list-floating': floating }"
   >
     <div
       data-testid="file-browser-floating-wrapper"
       class="diff-tree-list-floating-wrapper"
-      :style="{
-        width: newWidth ? `${newWidth}px` : undefined,
-        top: cachedTop ? `${cachedTop}px` : undefined,
-      }"
+      :style="floatingWrapperStyles"
     >
       <panel-resizer
         class="diff-tree-list-resizer"
@@ -139,8 +148,9 @@ export default {
         :hide-file-stats="hideFileStats"
         :loaded-files="loadedFiles"
         :total-files-count="totalFilesCount"
+        :row-height="rowHeight"
         @clickFile="onFileClick"
       />
     </div>
-  </div>
+  </file-browser-height>
 </template>

app/assets/javascripts/diffs/components/file_browser_height.vue

@@ -0,0 +1,77 @@
+<script>
+import { mapState } from 'pinia';
+import StickyViewportFillerHeight from '~/diffs/components/sticky_viewport_filler_height.vue';
+import { useBatchComments } from '~/batch_comments/store';
+import { observeElementOnce } from '~/lib/utils/dom_utils';
+
+export default {
+  name: 'FileBrowserHeight',
+  components: { StickyViewportFillerHeight },
+  data() {
+    return {
+      minHeight: 0,
+      bottomPadding: 0,
+      stickyTopOffset: 0,
+      reviewBarCachedHeight: 0,
+      mediaQueryMatch: null,
+      isNarrowScreen: false,
+    };
+  },
+  computed: {
+    ...mapState(useBatchComments, ['reviewBarRendered', 'draftsCount']),
+    reviewBarEnabled() {
+      return this.draftsCount > 0;
+    },
+    stickyBottomOffset() {
+      return this.reviewBarEnabled
+        ? this.bottomPadding + this.reviewBarCachedHeight
+        : this.bottomPadding;
+    },
+  },
+  watch: {
+    reviewBarRendered: {
+      handler(rendered) {
+        if (!rendered || this.reviewBarCachedHeight) return;
+        observeElementOnce(document.querySelector('.js-review-bar'), ([bar]) => {
+          this.reviewBarCachedHeight = bar.boundingClientRect.height;
+        });
+      },
+      immediate: true,
+    },
+  },
+  mounted() {
+    const styles = getComputedStyle(this.$el);
+    const largeBreakpointSize = parseInt(styles.getPropertyValue('--breakpoint-lg'), 10);
+    this.stickyTopOffset = parseInt(styles.getPropertyValue('top'), 10);
+    this.minHeight = parseInt(styles.getPropertyValue('--file-tree-min-height'), 10);
+    this.bottomPadding = parseInt(styles.getPropertyValue('--file-tree-bottom-padding'), 10);
+    this.mediaQueryMatch = window.matchMedia(`(max-width: ${largeBreakpointSize - 1}px)`);
+    this.handleMediaMatch(this.mediaQueryMatch);
+    this.mediaQueryMatch.addEventListener('change', this.handleMediaMatch);
+  },
+  beforeDestroy() {
+    this.mediaQueryMatch.removeEventListener('change', this.handleMediaMatch);
+    this.mediaQueryMatch = null;
+  },
+  methods: {
+    handleMediaMatch({ matches }) {
+      this.isNarrowScreen = matches;
+    },
+  },
+};
+</script>
+
+<template>
+  <sticky-viewport-filler-height
+    v-if="!isNarrowScreen"
+    ref="root"
+    :min-height="minHeight"
+    :sticky-top-offset="stickyTopOffset"
+    :sticky-bottom-offset="stickyBottomOffset"
+  >
+    <slot></slot>
+  </sticky-viewport-filler-height>
+  <div v-else>
+    <slot></slot>
+  </div>
+</template>