Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.rubocop_todo/gitlab/bounded_contexts.yml

@@ -2907,7 +2907,6 @@ Gitlab/BoundedContexts:
     - 'ee/app/models/elastic/index_setting.rb'
     - 'ee/app/models/elastic/migration_record.rb'
     - 'ee/app/models/elastic/reindexing_slice.rb'
-    - 'ee/app/models/elastic/reindexing_subtask.rb'
     - 'ee/app/models/elastic/reindexing_task.rb'
     - 'ee/app/models/elasticsearch_indexed_namespace.rb'
     - 'ee/app/models/elasticsearch_indexed_project.rb'

.rubocop_todo/gitlab/documentation_links/link.yml

@@ -22,7 +22,6 @@ Gitlab/DocumentationLinks/Link:
     - 'ee/app/helpers/projects/security/api_fuzzing_configuration_helper.rb'
     - 'ee/app/helpers/vulnerabilities_helper.rb'
     - 'ee/app/models/integrations/github.rb'
-    - 'ee/lib/api/managed_licenses.rb'
     - 'ee/lib/ee/gitlab/namespace_storage_size_error_message.rb'
     - 'ee/lib/gitlab/checks/secrets_check.rb'
     - 'ee/lib/gitlab/llm/chain/tools/tool.rb'
@@ -38,7 +37,6 @@ Gitlab/DocumentationLinks/Link:
     - 'lib/gitlab/usage_data_counters/hll_redis_counter.rb'
     - 'lib/slack/block_kit/app_home_opened.rb'
     - 'lib/system_check/helpers.rb'
-    - 'lib/users/internal.rb'
     - 'spec/helpers/ide_helper_spec.rb'
     - 'spec/mailers/emails/pages_domains_spec.rb'
     - 'spec/presenters/clusters/cluster_presenter_spec.rb'

.rubocop_todo/rails/inverse_of.yml

@@ -60,7 +60,6 @@ Rails/InverseOf:
     - 'ee/app/models/ee/project.rb'
     - 'ee/app/models/ee/service_desk_setting.rb'
     - 'ee/app/models/ee/user.rb'
-    - 'ee/app/models/elastic/reindexing_subtask.rb'
     - 'ee/app/models/geo/event.rb'
     - 'ee/app/models/geo/event_log.rb'
     - 'ee/app/models/geo/job_artifact_registry.rb'

.rubocop_todo/rspec/feature_category.yml

@@ -816,7 +816,6 @@ RSpec/FeatureCategory:
     - 'ee/spec/models/ee/users_statistics_spec.rb'
     - 'ee/spec/models/elastic/index_setting_spec.rb'
     - 'ee/spec/models/elastic/reindexing_slice_spec.rb'
-    - 'ee/spec/models/elastic/reindexing_subtask_spec.rb'
     - 'ee/spec/models/elastic/reindexing_task_spec.rb'
     - 'ee/spec/models/epic_user_mention_spec.rb'
     - 'ee/spec/models/gitlab/seat_link_data_spec.rb'

.rubocop_todo/search/namespaced_class.yml

@@ -31,7 +31,6 @@ Search/NamespacedClass:
     - 'ee/app/models/elastic/index_setting.rb'
     - 'ee/app/models/elastic/migration_record.rb'
     - 'ee/app/models/elastic/reindexing_slice.rb'
-    - 'ee/app/models/elastic/reindexing_subtask.rb'
     - 'ee/app/models/elastic/reindexing_task.rb'
     - 'ee/app/models/elasticsearch_indexed_namespace.rb'
     - 'ee/app/models/elasticsearch_indexed_project.rb'

.rubocop_todo/style/class_and_module_children.yml

@@ -421,7 +421,6 @@ Style/ClassAndModuleChildren:
     - 'ee/app/models/dast/profile_schedule.rb'
     - 'ee/app/models/ee/ci/job_artifact.rb'
     - 'ee/app/models/elastic/reindexing_slice.rb'
-    - 'ee/app/models/elastic/reindexing_subtask.rb'
     - 'ee/app/models/elastic/reindexing_task.rb'
     - 'ee/app/models/epic/metrics.rb'
     - 'ee/app/models/epic/related_epic_link.rb'

GITALY_SERVER_VERSION

@@ -1 +1 @@
-f5742bf5cd567c3bfc02aca8880bc8f73a7fb7c4
+c2675ac3885b916376fb35eb123dd54820ca797d

app/assets/javascripts/ci/pipelines_page/components/failure_widget/pipeline_failed_jobs_widget.vue

@@ -1,11 +1,12 @@
 <script>
-import { GlButton, GlIcon } from '@gitlab/ui';
+import { GlBadge, GlButton, GlIcon } from '@gitlab/ui';
 import CrudComponent from '~/vue_shared/components/crud_component.vue';
 import { __ } from '~/locale';
 import FailedJobsList from './failed_jobs_list.vue';
 
 export default {
   components: {
+    GlBadge,
     GlButton,
     GlIcon,
     FailedJobsList,
@@ -45,6 +46,9 @@ export default {
     bodyClasses() {
       return this.isExpanded ? '' : 'gl-hidden';
     },
+    failedJobsCountLabel() {
+      return `${this.isMaximumJobLimitReached ? '100+' : this.currentFailedJobsCount}`;
+    },
     iconName() {
       return this.isExpanded ? 'chevron-down' : 'chevron-right';
     },
@@ -75,7 +79,7 @@ export default {
   <crud-component
     :id="$options.ariaControlsId"
     class="expandable-card"
-    :class="{ 'is-collapsed gl-border-white hover:gl-border-gray-100': !isExpanded }"
+    :class="{ 'is-collapsed gl-border-transparent hover:gl-border-default': !isExpanded }"
     data-testid="failed-jobs-card"
     @click="toggleWidget"
   >
@@ -88,12 +92,16 @@ export default {
         @click="toggleWidget"
       >
         <gl-icon :name="iconName" class="gl-mr-2" />
-        <span class="gl-font-bold gl-text-secondary">
+        <span class="gl-font-bold gl-text-subtle">
           {{ $options.i18n.failedJobsLabel }}
         </span>
-        <span> ({{ currentFailedJobsCount }}) </span>
       </gl-button>
     </template>
+    <template #count>
+      <gl-badge>
+        {{ failedJobsCountLabel }}
+      </gl-badge>
+    </template>
     <failed-jobs-list
       v-if="isExpanded"
       :failed-jobs-count="failedJobsCount"

app/assets/javascripts/deployments/components/deployment_header.vue

@@ -6,12 +6,15 @@ import {
   GlSkeletonLoader,
   GlSprintf,
   GlTooltipDirective as GlTooltip,
+  GlTruncateText,
 } from '@gitlab/ui';
 import ClipboardButton from '~/vue_shared/components/clipboard_button.vue';
 import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
 import { s__, __ } from '~/locale';
 import DeploymentStatusLink from '~/environments/components/deployment_status_link.vue';
 import DeploymentCommit from '~/environments/components/commit.vue';
+import { renderGFM } from '~/behaviors/markdown/render_gfm';
+import SafeHtml from '~/vue_shared/directives/safe_html';
 import { isFinished } from '../utils';
 
 export default {
@@ -21,13 +24,15 @@ export default {
     GlLink,
     GlSkeletonLoader,
     GlSprintf,
+    GlTruncateText,
     ClipboardButton,
     TimeAgoTooltip,
     DeploymentStatusLink,
     DeploymentCommit,
   },
   directives: {
     GlTooltip,
+    SafeHtml,
   },
   props: {
     deployment: {
@@ -38,6 +43,11 @@ export default {
       required: true,
       type: Object,
     },
+    release: {
+      required: false,
+      default: null,
+      type: Object,
+    },
     loading: {
       required: false,
       default: false,
@@ -99,14 +109,19 @@ export default {
       return this.isFinished(this.deployment) ? this.finishedAt : this.createdAt;
     },
   },
+  mounted() {
+    renderGFM(this.$refs['gfm-content']);
+  },
   methods: {
     isFinished,
   },
+  safeHtmlConfig: { ADD_TAGS: ['gl-emoji'] },
   i18n: {
     copyButton: __('Copy commit SHA'),
     needsApproval: s__('Deployment|Needs Approval'),
     startedTimeagoText: s__('Deployment|Started %{timeago} by %{username}'),
     finishedTimeagoText: s__('Deployment|Finished %{timeago} by %{username}'),
+    releaseNotes: s__('Deployment|%{releaseName} release notes:'),
   },
 };
 </script>
@@ -157,5 +172,22 @@ export default {
       </time-ago-tooltip>
     </div>
     <deployment-commit :commit="commit" />
+    <p v-if="release" class="gl-my-3 gl-font-bold">
+      <gl-sprintf :message="$options.i18n.releaseNotes">
+        <template #releaseName>
+          <gl-link :href="release.links.selfUrl" data-testid="release-page-link">
+            {{ release.name }}
+          </gl-link>
+        </template>
+      </gl-sprintf>
+    </p>
+    <gl-truncate-text v-if="release" :lines="2" :mobile-lines="2">
+      <div
+        ref="gfm-content"
+        v-safe-html:[$options.safeHtmlConfig]="release.descriptionHtml"
+        class="md gl-z-0"
+        data-testid="release-description-content"
+      ></div>
+    </gl-truncate-text>
   </div>
 </template>

app/assets/javascripts/deployments/components/show_deployment.vue

@@ -5,6 +5,7 @@ import { toggleQueryPollingByVisibility, etagQueryHeaders } from '~/graphql_shar
 import { s__ } from '~/locale';
 import deploymentQuery from '../graphql/queries/deployment.query.graphql';
 import environmentQuery from '../graphql/queries/environment.query.graphql';
+import releaseQuery from '../graphql/queries/release.query.graphql';
 import DeploymentHeader from './deployment_header.vue';
 import DeploymentAside from './deployment_aside.vue';
 import DeploymentDeployBlock from './deployment_deploy_block.vue';
@@ -58,9 +59,25 @@ export default {
         this.errorMessage = this.$options.i18n.errorMessage;
       },
     },
+    release: {
+      query: releaseQuery,
+      variables() {
+        return { fullPath: this.projectPath, tagName: this.deployment?.ref };
+      },
+      update(data) {
+        return data?.project?.release;
+      },
+      skip() {
+        return !this.deployment?.tag;
+      },
+      error(error) {
+        captureException(error);
+        this.errorMessage = this.$options.i18n.errorMessage;
+      },
+    },
   },
   data() {
-    return { deployment: {}, environment: {}, errorMessage: '' };
+    return { deployment: {}, environment: {}, errorMessage: '', release: null };
   },
   computed: {
     hasError() {
@@ -104,6 +121,7 @@ export default {
           v-else
           :deployment="deployment"
           :environment="environment"
+          :release="release"
           :loading="isLoading"
         />
         <details-feedback class="gl-mt-6" />

app/assets/javascripts/deployments/graphql/queries/release.query.graphql

@@ -0,0 +1,13 @@
+query relatedRelease($fullPath: ID!, $tagName: String!) {
+  project(fullPath: $fullPath) {
+    id
+    release(tagName: $tagName) {
+      id
+      name
+      descriptionHtml
+      links {
+        selfUrl
+      }
+    }
+  }
+}

app/assets/javascripts/notes/components/diff_discussion_header.vue

@@ -137,7 +137,7 @@ export default {
       <toggle-replies-widget
         :collapsed="!discussion.expanded"
         :replies="replies"
-        class="gl-border-t -gl-mx-3 -gl-mb-3 gl-mt-4 !gl-border-x-0 !gl-border-b-0 gl-border-t-subtle"
+        class="gl-border-t -gl-mx-3 -gl-mb-3 gl-mt-4 !gl-border-x-0 !gl-border-b-0 gl-border-t-subtle dark:gl-border-t-section"
         @toggle="toggleDiscussionHandler"
       />
     </div>

app/assets/javascripts/notes/components/diff_with_note.vue

@@ -102,7 +102,7 @@ export default {
       :discussion-path="discussion.discussion_path"
       :diff-file="discussion.diff_file"
       :can-current-user-fork="false"
-      class="gl-border"
+      class="gl-border gl-border-section"
       :expanded="!isCollapsed"
     />
     <div v-if="isTextFile" class="diff-content">

app/assets/javascripts/notes/components/noteable_note.vue

@@ -421,7 +421,7 @@ export default {
     <div
       v-if="showMultiLineComment"
       data-testid="multiline-comment"
-      class="gl-border-b-1 gl-border-gray-100 gl-px-5 gl-py-3 gl-text-gray-500 gl-border-b-solid"
+      class="gl-border-b gl-border-section gl-px-5 gl-py-3 gl-text-subtle"
     >
       <gl-sprintf :message="__('Comment on lines %{startLine} to %{endLine}')">
         <template #startLine>

app/assets/javascripts/notes/components/toggle_replies_widget.vue

@@ -60,7 +60,7 @@ export default {
 <template>
   <li
     :class="{ '!gl-rounded-b-base gl-text-subtle': collapsed }"
-    class="toggle-replies-widget gl-border-r gl-border-l !gl-flex gl-flex-wrap gl-items-center gl-bg-subtle gl-px-5 gl-py-3"
+    class="toggle-replies-widget gl-border-r gl-border-l !gl-flex gl-flex-wrap gl-items-center gl-border-l-section gl-border-r-section gl-bg-subtle gl-px-5 gl-py-3"
     :aria-expanded="ariaState"
   >
     <gl-button

app/assets/stylesheets/framework/diffs.scss

@@ -807,7 +807,7 @@ table.code {
       margin-left: $note-spacing-left;
 
       &[aria-expanded="false"] {
-        @apply gl-border-b;
+        @apply gl-border-b gl-border-b-section;
       }
     }
   }

app/assets/stylesheets/framework/files.scss

@@ -3,10 +3,10 @@
  *
  */
 .file-holder {
-  @apply gl-border gl-rounded-base;
+  @apply gl-border gl-border-section gl-rounded-base;
 
   &.file-holder-top-border {
-    @apply gl-border;
+    @apply gl-border gl-border-section;
 
     .file-title {
       // Prevents the top border getting clipped by the background
@@ -20,7 +20,7 @@
 
   .file-title {
     position: relative;
-    @apply gl-bg-subtle gl-border-b;
+    @apply gl-bg-subtle gl-border-b gl-border-b-section;
     margin: 0;
     text-align: left;
     padding: 10px $gl-padding;
@@ -42,7 +42,7 @@
   .file-blame-legend {
     text-align: right;
     padding: 8px $gl-padding;
-    @apply gl-bg-subtle gl-border-b;
+    @apply gl-bg-subtle gl-border-b gl-border-b-section;
 
     @include media-breakpoint-down(xs) {
       text-align: left;
@@ -114,7 +114,7 @@
         margin-left: 40px;
         padding: 10px 0;
         margin-bottom: 0;
-        @apply gl-bg-default gl-border-l;
+        @apply gl-bg-default gl-border-l gl-border-l-section;
 
         li {
           color: $logs-li-color;
@@ -203,7 +203,7 @@ span.idiff {
     flex-wrap: wrap;
     align-items: center;
     justify-content: space-between;
-    @apply gl-bg-subtle gl-border-b;
+    @apply gl-bg-subtle gl-border-b gl-border-b-section;
     padding: $gl-padding-8 $gl-padding;
     margin: 0;
     min-height: px-to-rem($file-header-height);
@@ -241,7 +241,7 @@ span.idiff {
   display: flex;
   align-items: center;
   justify-content: flex-end;
-  @apply gl-bg-subtle gl-border-b;
+  @apply gl-bg-subtle gl-border-b gl-border-b-section;
   padding: 5px $gl-padding;
 }
 
@@ -286,7 +286,7 @@ span.idiff {
     padding-bottom: $gl-padding;
 
     .discussion-reply-holder {
-      @apply gl-border-b gl-border-b-subtle;
+      @apply gl-border-b gl-border-b-subtle dark:gl-border-b-section;
       border-radius: 0;
     }
   }
@@ -449,7 +449,7 @@ span.idiff {
 
   .tr {
     display: flex;
-    @apply gl-border-b gl-border-b-subtle;
+    @apply gl-border-b gl-border-b-subtle dark:gl-border-b-section;
 
     &.last-row {
       border-bottom: 0;
@@ -503,7 +503,7 @@ span.idiff {
 
 .blame.file-content .td.line-numbers {
   float: none;
-  @apply gl-border-l;
+  @apply gl-border-l gl-border-l-section;
   border-radius: 0;
 
   .file-line-num {
@@ -517,7 +517,7 @@ span.idiff {
 }
 
 .blame-stream-container {
-  @apply gl-border-t;
+  @apply gl-border-t gl-border-t-section;
 }
 
 .blame-stream-loading {