.gitlab/ci/global.gitlab-ci.yml

@@ -9,6 +9,7 @@
       - stuck_or_timeout_failure
       - unknown_failure
     exit_codes:
+      - 110  # known infrastructure error https://gitlab.com/gitlab-org/gitlab/-/issues/501325
       - 111  # low free disk space https://gitlab.com/gitlab-org/gitlab/-/issues/498142
 
 .default-utils-before_script:

.gitlab/ci/qa-common/variables.gitlab-ci.yml

@@ -18,4 +18,4 @@ variables:
   # Retry failed specs in separate process
   QA_RETRY_FAILED_SPECS: "true"
   # helm chart ref used by test-on-cng pipeline
-  GITLAB_HELM_CHART_REF: "37f35b47e7762d1c4b229ed7f00579666d9c0d9c"
+  GITLAB_HELM_CHART_REF: "a2ea74990ebffd32c28b2562e4d5a29effb1d95b"

.gitlab/issue_templates/Geo Replicate a new Git repository type.md

@@ -345,14 +345,6 @@ That's all of the required database changes.
         ::CoolWidget
       end
 
-      def self.git_access_class
-        ::Gitlab::GitAccessCoolWidget
-      end
-
-      def self.no_repo_message
-        git_access_class.error_message(:no_repo)
-      end
-
       override :verification_feature_flag_enabled?
       def self.verification_feature_flag_enabled?
         # We are adding verification at the same time as replication, so we
@@ -399,7 +391,6 @@ That's all of the required database changes.
 
 - [ ] Make sure a Geo secondary site can request and download Cool Widgets on the Geo primary site. You may need to make some changes to `Gitlab::GitAccessCoolWidget`. For example, see [this change for Group-level Wikis](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54914/diffs?commit_id=0f2b36f66697b4addbc69bd377ee2818f648dd33).
 
-- [ ] Make sure a Geo secondary site marks Cool Widgets as missing on primary when a repository does not exist on the Geo primary site. The only way to know about this is to parse the error text. You may need to make some changes to `Gitlab::CoolWidgetReplicator.no_repo_message` to return the proper error message. For example, see [this change for Group-level Wikis](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74133). Alternatively, if a repository should *always* exist on the primary, then a Geo-specific workaround is to create an empty repository when verifying on primary. See examples for [project wikis](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/123869) and [design repositories](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/123917).
 
 - [ ] Generate the feature flag definition files by running the feature flag commands and following the command prompts:
 

.rubocop_todo/rspec/receive_messages.yml

@@ -600,7 +600,6 @@ RSpec/ReceiveMessages:
     - 'spec/views/projects/tags/index.html.haml_spec.rb'
     - 'spec/views/projects/tree/show.html.haml_spec.rb'
     - 'spec/views/shared/_broadcast_message.html.haml_spec.rb'
-    - 'spec/views/shared/_token_expiration_banner.html.haml_spec.rb'
     - 'spec/views/shared/projects/_list.html.haml_spec.rb'
     - 'spec/views/shared/projects/_project_card.html.haml_spec.rb'
     - 'spec/views/user_settings/ssh_keys/_key.html.haml_spec.rb'

.rubocop_todo/sidekiq_load_balancing/worker_data_consistency.yml

@@ -6,9 +6,7 @@ SidekiqLoadBalancing/WorkerDataConsistency:
     - 'app/workers/ci/build_schedule_worker.rb'
     - 'app/workers/ci/build_trace_chunk_flush_worker.rb'
     - 'app/workers/ci/cancel_pipeline_worker.rb'
-    - 'app/workers/ci/daily_build_group_report_results_worker.rb'
     - 'app/workers/ci/delete_objects_worker.rb'
-    - 'app/workers/ci/delete_unit_tests_worker.rb'
     - 'app/workers/ci/drop_pipeline_worker.rb'
     - 'app/workers/ci/job_artifacts/expire_project_build_artifacts_worker.rb'
     - 'app/workers/ci/job_token/log_authorization_worker.rb'
@@ -16,7 +14,6 @@ SidekiqLoadBalancing/WorkerDataConsistency:
     - 'app/workers/ci/partitioning_worker.rb'
     - 'app/workers/ci/pending_builds/update_group_worker.rb'
     - 'app/workers/ci/pending_builds/update_project_worker.rb'
-    - 'app/workers/ci/pipeline_artifacts/coverage_report_worker.rb'
     - 'app/workers/ci/pipeline_artifacts/create_quality_report_worker.rb'
     - 'app/workers/ci/pipeline_artifacts/expire_artifacts_worker.rb'
     - 'app/workers/ci/pipeline_cleanup_ref_worker.rb'

GITALY_SERVER_VERSION

-96b154da1923b73abd2c3f8fa9a932e5c371e75c
+684223991b8f70270b79f268709338dfb4e38fbe

GITLAB_KAS_VERSION

-7d833696b8717ca3de55d1bf7fd8db0fd1415c52
+41e89d9a8fcdb20b239c8b7139fc7bc1fb010098

app/assets/javascripts/blob/components/blob_header.vue

@@ -101,6 +101,11 @@ export default {
       required: false,
       default: true,
     },
+    editButtonVariant: {
+      type: String,
+      required: false,
+      default: 'confirm',
+    },
   },
   data() {
     return {
@@ -163,6 +168,7 @@ export default {
       <web-ide-link
         v-if="showWebIdeLink"
         :show-edit-button="!isBinary"
+        :button-variant="editButtonVariant"
         class="gl-mr-3"
         :edit-url="blob.editBlobPath"
         :web-ide-url="blob.ideEditPath"

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

@@ -366,7 +366,7 @@ export default {
           <span class="js-assignee-tooltip">
             <span class="gl-block gl-font-bold">{{ __('Assignee') }}</span>
             {{ assignee.name }}
-            <span class="text-white-50">@{{ assignee.username }}</span>
+            <span>@{{ assignee.username }}</span>
           </span>
         </user-avatar-link>
         <span

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

@@ -397,9 +397,9 @@ export default {
         >
           {{ $options.i18n.deleteButtonText }}</gl-button
         >
-        <div>
-          <gl-button @click="cancel">{{ cancelProps.text }}</gl-button>
-          <gl-button v-bind="primaryProps.attributes" @click="submit">{{
+        <div class="gl-flex gl-gap-3">
+          <gl-button class="!gl-m-0" @click="cancel">{{ cancelProps.text }}</gl-button
+          ><gl-button v-bind="primaryProps.attributes" class="!gl-m-0" @click="submit">{{
             primaryProps.text
           }}</gl-button>
         </div>

app/assets/javascripts/issuable/components/issue_assignees.vue

@@ -93,7 +93,7 @@ export default {
     >
       <span class="js-assignee-tooltip">
         <span class="gl-block gl-font-bold">{{ s__('Label|Assignee') }}</span> {{ assignee.name }}
-        <span v-if="assignee.username" class="text-white-50">@{{ assignee.username }}</span>
+        <span v-if="assignee.username">@{{ assignee.username }}</span>
       </span>
     </user-avatar-link>
     <span

app/assets/javascripts/packages_and_registries/container_registry/explorer/index.js

-import { GlToast } from '@gitlab/ui';
 import Vue from 'vue';
 import { parseBoolean } from '~/lib/utils/common_utils';
 import PerformancePlugin from '~/performance/vue_performance_plugin';
@@ -10,7 +9,6 @@ import RegistryExplorer from './pages/index.vue';
 import createRouter from './router';
 
 Vue.use(Translate);
-Vue.use(GlToast);
 
 Vue.use(PerformancePlugin, {
   components: [

app/assets/javascripts/packages_and_registries/harbor_registry/index.js

-import { GlToast } from '@gitlab/ui';
 import Vue from 'vue';
 import { parseBoolean } from '~/lib/utils/common_utils';
 import PerformancePlugin from '~/performance/vue_performance_plugin';
@@ -9,7 +8,6 @@ import createRouter from './router';
 import HarborRegistryExplorer from './pages/index.vue';
 
 Vue.use(Translate);
-Vue.use(GlToast);
 
 Vue.use(PerformancePlugin, {
   components: [

app/assets/javascripts/super_sidebar/components/nav_item.vue

@@ -249,7 +249,11 @@ export default {
         :style="activeIndicatorStyle"
         data-testid="active-indicator"
       ></div>
-      <div v-if="!isFlyout" class="gl-flex gl-w-6 gl-shrink-0">
+      <div
+        v-if="!isFlyout"
+        class="gl-flex gl-w-6 gl-shrink-0"
+        :class="{ 'gl-self-start': hasAvatar }"
+      >
         <slot name="icon">
           <gl-icon
             v-if="item.icon"
@@ -259,7 +263,8 @@ export default {
           <gl-icon
             v-else-if="isInPinnedSection"
             name="grip"
-            class="js-draggable-icon show-on-focus-or-hover--target super-sidebar-mix-blend-mode gl-m-auto gl-cursor-grab gl-text-gray-400"
+            class="js-draggable-icon show-on-focus-or-hover--target super-sidebar-mix-blend-mode gl-m-auto gl-cursor-grab"
+            variant="subtle"
           />
           <gl-avatar
             v-else-if="hasAvatar"
@@ -272,7 +277,7 @@ export default {
         </slot>
       </div>
       <div
-        class="gl-grow gl-text-default"
+        class="gl-grow gl-break-all gl-text-default"
         :class="{ 'gl-w-max': isFlyout }"
         data-testid="nav-item-link-label"
       >

app/assets/javascripts/todos/components/todo_item.vue

@@ -50,7 +50,7 @@ export default {
       :href="targetUrl"
       :data-track-label="trackingLabel"
       :data-track-action="$options.TRACK_ACTION"
-      class="gl-flex gl-flex-wrap gl-gap-x-2 !gl-text-default !gl-no-underline !gl-outline-none sm:gl-flex-nowrap sm:gl-items-center"
+      class="gl-flex gl-flex-wrap gl-justify-end gl-gap-x-2 !gl-text-default !gl-no-underline !gl-outline-none sm:gl-flex-nowrap sm:gl-items-center"
     >
       <div
         class="gl-w-64 gl-flex-grow-2 gl-self-center gl-overflow-hidden gl-overflow-x-auto sm:gl-w-auto"
@@ -58,11 +58,12 @@ export default {
         <todo-item-title :todo="todo" />
         <todo-item-body :todo="todo" :current-user-id="currentUserId" />
       </div>
-      <todo-item-actions
-        :todo="todo"
-        class="sm:gl-order-3"
-        @change="(id, markedAsDone) => $emit('change', id, markedAsDone)"
-      />
+      <div class="sm:gl-order-3">
+        <todo-item-actions
+          :todo="todo"
+          @change="(id, markedAsDone) => $emit('change', id, markedAsDone)"
+        />
+      </div>
       <todo-item-timestamp
         :todo="todo"
         class="gl-w-full gl-whitespace-nowrap gl-px-2 sm:gl-w-auto"

app/assets/javascripts/todos/components/todos_app.vue

@@ -246,7 +246,9 @@ export default {
 
 <template>
   <div>
-    <div class="gl-flex gl-justify-between gl-border-b-1 gl-border-default gl-border-b-solid">
+    <div
+      class="gl-flex gl-flex-wrap-reverse gl-justify-between gl-border-b-1 gl-border-default gl-border-b-solid"
+    >
       <gl-tabs
         :value="currentTab"
         content-class="gl-p-0"
@@ -273,7 +275,7 @@ export default {
         </gl-tab>
       </gl-tabs>
 
-      <div class="gl-my-3 gl-mr-5 gl-flex gl-items-center gl-justify-end gl-gap-3">
+      <div class="gl-my-3 gl-mr-5 gl-flex gl-flex-grow gl-items-center gl-justify-end gl-gap-3">
         <todos-mark-all-done-button
           v-if="showMarkAllAsDone"
           :filters="queryFilterValues"

app/assets/javascripts/todos/components/todos_filter_bar.vue

@@ -480,6 +480,9 @@ export default {
         @clear="onFiltersCleared"
       />
       <gl-sorting
+        class="gl-flex"
+        dropdown-class="gl-w-full"
+        block
         :sort-options="$options.SORT_OPTIONS"
         :sort-by="sortBy"
         :is-ascending="isAscending"

app/assets/javascripts/vue_shared/components/web_ide_link.stories.js

@@ -16,6 +16,7 @@ const Template = (args, { argTypes }) => ({
 
 export const Default = Template.bind({});
 export const Blob = Template.bind({});
+export const WithButtonVariant = Template.bind({});
 
 const defaultArgs = {
   isFork: false,
@@ -36,3 +37,8 @@ Blob.args = {
   ...defaultArgs,
   isBlob: true,
 };
+
+WithButtonVariant.args = {
+  ...defaultArgs,
+  buttonVariant: 'confirm',
+};

app/assets/javascripts/vue_shared/components/web_ide_link.vue

@@ -84,6 +84,11 @@ export default {
       required: false,
       default: '',
     },
+    buttonVariant: {
+      type: String,
+      required: false,
+      default: null,
+    },
     pipelineEditorUrl: {
       type: String,
       required: false,
@@ -147,6 +152,12 @@ export default {
     hasActions() {
       return this.actions.length > 0;
     },
+    editButtonVariant() {
+      if (this.buttonVariant) {
+        return this.buttonVariant;
+      }
+      return this.isBlob ? 'confirm' : 'default';
+    },
     editAction() {
       if (!this.showEditButton) return null;
 
@@ -295,7 +306,7 @@ export default {
 <template>
   <div v-if="hasActions" :class="cssClasses">
     <gl-disclosure-dropdown
-      :variant="isBlob ? 'confirm' : 'default'"
+      :variant="editButtonVariant"
       :category="isBlob ? 'primary' : 'secondary'"
       :toggle-text="$options.i18n.toggleText"
       data-testid="action-dropdown"

app/assets/stylesheets/framework/buttons.scss

@@ -50,26 +50,6 @@
   }
 }
 
-@mixin btn-color($light, $border-light, $normal, $border-normal, $dark, $border-dark, $color) {
-  background-color: $light;
-  border-color: $border-light;
-  color: $color;
-
-  &:hover,
-  &:focus {
-    background-color: $normal;
-    border-color: $border-normal;
-    color: $color;
-  }
-
-  &:active,
-  &.active {
-    background-color: $dark;
-    border-color: $border-dark;
-    color: $color;
-  }
-}
-
 @mixin btn-with-margin {
   margin-left: $gl-spacing-scale-3;
   float: left;
@@ -80,11 +60,22 @@
 }
 
 .btn {
-  @include btn-default;
-  @include btn-color($white, $gray-200, $gray-50, $gray-200, $gray-100, $gray-300, $gl-text-color);
-
-  color: $gl-text-color;
   white-space: nowrap;
+  @include btn-default;
+  @include gl-button-theme(
+    $color: var(--gl-button-default-primary-foreground-color-default),
+    $background-color: var(--gl-button-default-primary-background-color-default),
+    $border-color: var(--gl-button-default-primary-border-color-default),
+    $hover-color: var(--gl-button-default-primary-foreground-color-hover),
+    $hover-background-color: var(--gl-button-default-primary-background-color-hover),
+    $hover-border-color: var(--gl-button-default-primary-border-color-hover),
+    $focus-color: var(--gl-button-default-primary-foreground-color-focus),
+    $focus-background-color: var(--gl-button-default-primary-background-color-focus),
+    $focus-border-color: var(--gl-button-default-primary-border-color-focus),
+    $active-color: var(--gl-button-default-primary-foreground-color-active),
+    $active-background-color: var(--gl-button-default-primary-background-color-active),
+    $active-border-color: var(--gl-button-default-primary-border-color-active),
+  );
 
   &:focus:active {
     outline: 0;
@@ -96,8 +87,21 @@
     }
   }
 
-  &.btn-danger {
-    @include btn-color($red-500, $red-600, $red-600, $red-700, $red-700, $red-800, $white-contrast);
+  &.btn-danger.btn-danger {
+    @include gl-button-theme(
+      $color: var(--gl-button-danger-primary-foreground-color-default),
+      $background-color: var(--gl-button-danger-primary-background-color-default),
+      $border-color: var(--gl-button-danger-primary-border-color-default),
+      $hover-color: var(--gl-button-danger-primary-foreground-color-hover),
+      $hover-background-color: var(--gl-button-danger-primary-background-color-hover),
+      $hover-border-color: var(--gl-button-danger-primary-border-color-hover),
+      $focus-color: var(--gl-button-danger-primary-foreground-color-focus),
+      $focus-background-color: var(--gl-button-danger-primary-background-color-focus),
+      $focus-border-color: var(--gl-button-danger-primary-border-color-focus),
+      $active-color: var(--gl-button-danger-primary-foreground-color-active),
+      $active-background-color: var(--gl-button-danger-primary-background-color-active),
+      $active-border-color: var(--gl-button-danger-primary-border-color-active),
+    );
   }
 
   &.btn-grouped {