Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.gitlab/ci/release-environments/main.gitlab-ci.yml

@@ -89,7 +89,7 @@ release-environments-qa:
   extends:
     - .qa-base
   timeout: 30m
-  parallel: 5
+  parallel: 3
   variables:
     QA_SCENARIO: "Test::Instance::Smoke"
     RELEASE: "${CI_REGISTRY}/${CI_PROJECT_PATH}/gitlab-ee-qa:${CI_COMMIT_SHA}"

.rubocop_todo/gitlab/bounded_contexts.yml

@@ -1378,7 +1378,6 @@ Gitlab/BoundedContexts:
     - 'app/policies/list_policy.rb'
     - 'app/policies/merge_request_policy.rb'
     - 'app/policies/merge_requests_closing_issues_policy.rb'
-    - 'app/policies/metrics/dashboard/annotation_policy.rb'
     - 'app/policies/milestone_policy.rb'
     - 'app/policies/namespace/package_setting_policy.rb'
     - 'app/policies/namespace/root_storage_statistics_policy.rb'

.rubocop_todo/layout/empty_line_after_magic_comment.yml

@@ -63,7 +63,6 @@ Layout/EmptyLineAfterMagicComment:
     - 'app/policies/dependency_proxy/group_setting_policy.rb'
     - 'app/policies/dependency_proxy/image_ttl_group_policy_policy.rb'
     - 'app/policies/dependency_proxy/manifest_policy.rb'
-    - 'app/policies/metrics/dashboard/annotation_policy.rb'
     - 'app/policies/packages/composer/metadatum_policy.rb'
     - 'app/policies/packages/conan/file_metadatum_policy.rb'
     - 'app/policies/packages/conan/metadatum_policy.rb'

.rubocop_todo/style/inline_disable_annotation.yml

@@ -1702,7 +1702,6 @@ Style/InlineDisableAnnotation:
     - 'ee/lib/ee/users/internal.rb'
     - 'ee/lib/elastic/instance_proxy_util.rb'
     - 'ee/lib/elastic/latest/git_class_proxy.rb'
-    - 'ee/lib/elastic/latest/issue_class_proxy.rb'
     - 'ee/lib/elastic/latest/note_class_proxy.rb'
     - 'ee/lib/elastic/latest/project_class_proxy.rb'
     - 'ee/lib/elastic/latest/user_class_proxy.rb'

.ruby-version

@@ -1 +1 @@
-3.2.3
+3.2.4

Gemfile

@@ -589,7 +589,7 @@ gem 'gitlab-mail_room', '~> 0.0.24', require: 'mail_room', feature_category: :sh
 gem 'email_reply_trimmer', '~> 0.1' # rubocop:todo Gemfile/MissingFeatureCategory
 gem 'html2text' # rubocop:todo Gemfile/MissingFeatureCategory
 
-gem 'stackprof', '~> 0.2.25', require: false # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'stackprof', '~> 0.2.26', require: false, feature_category: :shared
 gem 'rbtrace', '~> 0.4', require: false # rubocop:todo Gemfile/MissingFeatureCategory
 gem 'memory_profiler', '~> 1.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory
 gem 'activerecord-explain-analyze', '~> 0.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory
@@ -614,7 +614,7 @@ gem 'ssh_data', '~> 1.3' # rubocop:todo Gemfile/MissingFeatureCategory
 gem 'spamcheck', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory
 
 # Gitaly GRPC protocol definitions
-gem 'gitaly', '~> 17.1.0', feature_category: :gitaly
+gem 'gitaly', '~> 17.2.0', feature_category: :gitaly
 
 # KAS GRPC protocol definitions
 gem 'kas-grpc', '~> 0.5.0', feature_category: :deployment_management

Gemfile.checksum

@@ -206,7 +206,7 @@
 {"name":"gettext","version":"3.4.9","platform":"ruby","checksum":"292864fe6a15c224cee4125a4a72fab426fdbb280e4cff3cfe44935f549b009a"},
 {"name":"gettext_i18n_rails","version":"1.12.0","platform":"ruby","checksum":"6ac4817731a9e2ce47e1e83381ac34f9142263bc2911aaaafb2526d2f1afc1be"},
 {"name":"git","version":"1.18.0","platform":"ruby","checksum":"c9b80462e4565cd3d7a9ba8440c41d2c52244b17b0dad0bfddb46de70630c465"},
-{"name":"gitaly","version":"17.1.2","platform":"ruby","checksum":"def450eec7243770cba6f874502dcde470338968a724f1b86efd62a8caea2c5f"},
+{"name":"gitaly","version":"17.2.0","platform":"ruby","checksum":"48eee8883c43bb2f8fedbb43e4543439cfe37c33becebaec9ea1d425f9cce865"},
 {"name":"gitlab","version":"4.19.0","platform":"ruby","checksum":"3f645e3e195dbc24f0834fbf83e8ccfb2056d8e9712b01a640aad418a6949679"},
 {"name":"gitlab-chronic","version":"0.10.5","platform":"ruby","checksum":"f80f18dc699b708870a80685243331290bc10cfeedb6b99c92219722f729c875"},
 {"name":"gitlab-dangerfiles","version":"4.8.0","platform":"ruby","checksum":"b327d079552ec974a63bf34d749a0308425af6ebf51d01064f1a6ff216a523db"},
@@ -678,7 +678,7 @@
 {"name":"sprockets-rails","version":"3.5.1","platform":"ruby","checksum":"c44626cb3887a1a8b572ca258685db33b4ebd041aa73428a716eac444ee5ef48"},
 {"name":"ssh_data","version":"1.3.0","platform":"ruby","checksum":"ec7c1e95a3aebeee412147998f4c147b4b05da6ed0aafda6083f9449318eaac0"},
 {"name":"ssrf_filter","version":"1.0.8","platform":"ruby","checksum":"03f49f54837e407d43ee93ec733a8a94dc1bcf8185647ac61606e63aaedaa0db"},
-{"name":"stackprof","version":"0.2.25","platform":"ruby","checksum":"28db0e2d22b817ae35def7163822505a04a026b02ef119b6aa89d70b967b0d2e"},
+{"name":"stackprof","version":"0.2.26","platform":"ruby","checksum":"ee408cbcccd9422aabd66edff8b76a77d67955f2ee1b674961b5dfaa2cc7b8bd"},
 {"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"},

Gemfile.lock

@@ -692,7 +692,7 @@ GEM
     git (1.18.0)
       addressable (~> 2.8)
       rchardet (~> 1.8)
-    gitaly (17.1.2)
+    gitaly (17.2.0)
       grpc (~> 1.0)
     gitlab (4.19.0)
       httparty (~> 0.20)
@@ -1747,7 +1747,7 @@ GEM
       sprockets (>= 3.0.0)
     ssh_data (1.3.0)
     ssrf_filter (1.0.8)
-    stackprof (0.2.25)
+    stackprof (0.2.26)
     state_machines (0.5.0)
     state_machines-activemodel (0.8.0)
       activemodel (>= 5.1)
@@ -2022,7 +2022,7 @@ DEPENDENCIES
   gdk-toogle (~> 0.9, >= 0.9.5)
   gettext (~> 3.4, >= 3.4.9)
   gettext_i18n_rails (~> 1.12.0)
-  gitaly (~> 17.1.0)
+  gitaly (~> 17.2.0)
   gitlab-backup-cli!
   gitlab-chronic (~> 0.10.5)
   gitlab-dangerfiles (~> 4.8.0)
@@ -2257,7 +2257,7 @@ DEPENDENCIES
   sprockets (~> 3.7.0)
   sprockets-rails (~> 3.5.1)
   ssh_data (~> 1.3)
-  stackprof (~> 0.2.25)
+  stackprof (~> 0.2.26)
   state_machines-activerecord (~> 0.8.0)
   static_holmes (~> 0.7.11)
   sys-filesystem (~> 1.4.3)

app/assets/javascripts/ci/pipeline_editor/components/editor/ci_editor_header.vue

@@ -12,7 +12,7 @@ import {
 
 export default {
   i18n: {
-    browseCatalog: __('Browse CI/CD Catalog'),
+    browseCatalog: __('CI/CD Catalog'),
     help: __('Help'),
     jobAssistant: s__('JobAssistant|Job assistant'),
   },
@@ -67,7 +67,7 @@ export default {
     <gl-button
       :href="ciCatalogPath"
       size="small"
-      icon="external-link"
+      icon="catalog-checkmark"
       target="_blank"
       data-testid="catalog-repo-link"
       @click="trackCatalogBrowsing"

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

@@ -12,7 +12,7 @@ export default {
 <template>
   <span class="file-row-stats">
     <span class="cgreen"> +{{ file.addedLines }} </span>
-    <span class="cred"> -{{ file.removedLines }} </span>
+    <span data-testid="file-removed-lines" class="gl-text-red-500"> -{{ file.removedLines }} </span>
   </span>
 </template>
 

app/assets/javascripts/diffs/store/actions.js

@@ -10,7 +10,12 @@ import axios from '~/lib/utils/axios_utils';
 
 import { HTTP_STATUS_NOT_FOUND, HTTP_STATUS_OK } from '~/lib/utils/http_status';
 import Poll from '~/lib/utils/poll';
-import { mergeUrlParams, getLocationHash, getParameterValues } from '~/lib/utils/url_utility';
+import {
+  mergeUrlParams,
+  getLocationHash,
+  getParameterValues,
+  removeParams,
+} from '~/lib/utils/url_utility';
 import notesEventHub from '~/notes/event_hub';
 import { generateTreeList } from '~/diffs/utils/tree_worker_utils';
 import { sortTree } from '~/ide/stores/utils';
@@ -394,7 +399,7 @@ export const fetchCoverageFiles = ({ commit, state }) => {
 export const setHighlightedRow = ({ commit }, { lineCode, event }) => {
   if (event && event.target.href) {
     event.preventDefault();
-    window.history.replaceState(null, undefined, event.target.href);
+    window.history.replaceState(null, undefined, removeParams(['pin'], event.target.href));
   }
   const fileHash = lineCode.split('_')[0];
   commit(types.SET_HIGHLIGHTED_ROW, lineCode);

app/assets/javascripts/merge_conflicts/merge_conflict_resolver_app.vue

@@ -100,7 +100,7 @@ export default {
           <div data-testid="conflicts-count">
             <gl-sprintf :message="$options.i18n.commitStatSummary">
               <template #conflict>
-                <strong class="cred">{{ getConflictsCountText }}</strong>
+                <strong class="gl-text-danger">{{ getConflictsCountText }}</strong>
               </template>
               <template #sourceBranch>
                 <strong class="ref-name">{{ conflictsData.sourceBranch }}</strong>

app/assets/javascripts/pages/projects/graphs/components/code_coverage.vue

@@ -175,11 +175,11 @@ export default {
       <gl-alert
         v-if="noDataAvailable"
         variant="info"
-        :title="s__('Code Coverage| Empty code coverage data')"
+        :title="s__('Code Coverage|No code coverage data')"
         :dismissible="false"
       >
         <span>
-          {{ __('It seems that there is currently no available data for code coverage') }}
+          {{ __('Code coverage results are not yet available. Try again later.') }}
         </span>
       </gl-alert>
       <gl-collapsible-listbox

app/assets/javascripts/projects/settings_service_desk/components/service_desk_setting.vue

@@ -186,9 +186,8 @@ export default {
       });
     },
     issuesHelpPagePath() {
-      // eslint-disable-next-line local-rules/require-valid-help-page-path
-      return helpPagePath('user/project/settings/index.md', {
-        anchor: 'configure-project-visibility-features-and-permissions',
+      return helpPagePath('user/project/settings/index', {
+        anchor: 'configure-project-features-and-permissions',
       });
     },
     areTicketsConfidentialByDefaultHelp() {

app/assets/javascripts/vue_merge_request_widget/components/review_app_link.vue

@@ -43,6 +43,6 @@ export default {
     data-track-action="open_review_app"
     data-track-label="review_app"
   >
-    {{ display.text }} <gl-icon class="fgray" name="external-link" />
+    {{ display.text }} <gl-icon class="gl-fill-gray-500" name="external-link" />
   </gl-button>
 </template>

app/assets/javascripts/vue_shared/components/file_finder/item.vue

@@ -106,7 +106,7 @@ export default {
         <span class="cgreen bold">
           <gl-icon name="file-addition" class="align-text-top" /> {{ file.addedLines }}
         </span>
-        <span class="cred bold ml-1">
+        <span class="gl-text-red-500 bold ml-1">
           <gl-icon name="file-deletion" class="align-text-top" /> {{ file.removedLines }}
         </span>
       </span>

app/assets/stylesheets/framework/common.scss

@@ -72,13 +72,9 @@
 /** COLORS **/
 .cgray { color: $gl-text-color; }
 .clgray { color: $gray-200; }
-.cred { color: $red-500; }
 .cgreen { color: $green-600; }
 .cdark { color: $gray-800; }
 
-.fwhite { fill: $white; }
-.fgray { fill: $gray-500; }
-
 .text-plain,
 .text-plain:hover {
   color: $gl-text-color;

app/policies/metrics/dashboard/annotation_policy.rb

@@ -32,7 +32,7 @@
       = sprite_icon('check', css_class: 'cgreen')
       #{ s_('HealthCheck|Healthy') }
     - else
-      = sprite_icon('warning-solid', css_class: 'cred')
+      = sprite_icon('warning-solid', css_class: 'gl-text-danger')
       #{ s_('HealthCheck|Unhealthy') }
   - c.with_body do
     - if no_errors

app/views/admin/health_check/show.html.haml

@@ -111,7 +111,7 @@
             %li{ class: 'gl-px-5!' }
               %span.light
                 = _('repository:')
-              %strong.cred
+              %strong.gl-text-danger
                 = _('does not exist')
 
           - if @project.archived?
@@ -155,7 +155,7 @@
               = _("This repository has never been checked.")
             - elsif @project.last_repository_check_failed?
               - failed_message = _("This repository was last checked %{last_check_timestamp}. The check %{strong_start}failed.%{strong_end} See the 'repocheck.log' file for error messages.")
-              - failed_message = failed_message % { last_check_timestamp: @project.last_repository_check_at.to_fs(:medium), strong_start: "<strong class='cred'>", strong_end: "</strong>" }
+              - failed_message = failed_message % { last_check_timestamp: @project.last_repository_check_at.to_fs(:medium), strong_start: "<strong class='gl-text-danger'>", strong_end: "</strong>" }
               = failed_message.html_safe
             - else
               = _("This repository was last checked %{last_check_timestamp}. The check passed.") % { last_check_timestamp: @project.last_repository_check_at.to_fs(:medium) }

app/views/admin/projects/show.html.haml

@@ -61,7 +61,7 @@
           %li.two-factor-status{ class: list_item_classes }
             %span.gl-text-secondary= _('Two-factor Authentication:')
             .gl-col-span-2
-              %strong{ class: @user.two_factor_enabled? ? 'cgreen' : 'cred' }
+              %strong{ class: @user.two_factor_enabled? ? 'cgreen' : 'gl-text-danger' }
                 - if @user.two_factor_enabled?
                   = _('Enabled')
                   = link_button_to _('Disable'), disable_two_factor_admin_user_path(@user), aria: { label: _('Disable') }, data: { confirm: _('Are you sure?'), 'confirm-btn-variant': 'danger' }, method: :patch, class: 'gl-float-right', title: _('Disable Two-factor Authentication'), variant: :danger, size: :small
@@ -103,7 +103,7 @@
             %li{ class: list_item_classes }
               %span.gl-text-secondary= _('Confirmed:')
               .gl-col-span-2
-                %strong.cred= _('No')
+                %strong.gl-text-danger= _('No')
 
           %li{ class: list_item_classes }
             %span.gl-text-secondary= _('Current sign-in IP:')

app/views/admin/users/show.html.haml

@@ -15,13 +15,6 @@
     = _('Environment:')
     = env_name
 
-- if metric_query = @alert.prometheus_alert&.full_query
-  %p
-    = _('Metric:')
-
-    %pre
-      = metric_query
-
 - if @alert.show_incident_issues_link?
   %p
     = link_to(_('View incident issues.'), @alert.incident_issues_link)

app/views/notify/prometheus_alert_fired_email.html.haml

@@ -11,10 +11,6 @@
 <%= _('Environment:') %> <%= env_name %>
 <% end %>
 
-<% if metric_query = @alert.prometheus_alert&.full_query %>
-<%= _('Metric:') %> <%= metric_query %>
-<% end %>
-
 <% if @alert.show_incident_issues_link? %>
 <%= _('View incident issues.') %> <%= @alert.incident_issues_link %>
 <% end %>

app/views/notify/prometheus_alert_fired_email.text.erb

@@ -30,7 +30,7 @@
               = sprite_icon('milestone', css_class: 'gl-vertical-align-text-bottom')
               = issue.milestone.title
         - if issue.due_date
-          %span.issuable-due-date.gl-hidden.sm:gl-inline-block.has-tooltip{ class: "#{'cred' if issue.overdue? && !issue.closed?}", title: _('Due date') }
+          %span.issuable-due-date.gl-hidden.sm:gl-inline-block.has-tooltip{ class: "#{'gl-text-danger' if issue.overdue? && !issue.closed?}", title: _('Due date') }
              
             = sprite_icon('calendar')
             = issue.due_date.to_fs(:medium)

app/views/projects/_issue.html.haml

@@ -1,8 +1,13 @@
+- breadcrumb_title _('Artifacts')
+- @breadcrumb_link = browse_project_job_artifacts_path(@project, @build)
 - page_title @path, _('Artifacts'), "#{@build.name} (##{@build.id})", _('Jobs')
 - add_page_specific_style 'page_bundles/tree'
 
 = render "projects/jobs/header"
 
+- add_to_breadcrumbs(s_('CICD|Jobs'), project_jobs_path(@project))
+- add_to_breadcrumbs("##{@build.id}", project_job_path(@project, @build))
+
 .tree-holder
   = render 'projects/artifacts/file_navigation', project: @project, build: @build, path: @path
 

app/views/projects/artifacts/file.html.haml

@@ -2,7 +2,7 @@
   .gpg-popover-certificate-details
     %strong= _('Certificate Subject')
     - if signature.x509_certificate.revoked?
-      %strong.cred= _('(revoked)')
+      %strong.gl-text-danger= _('(revoked)')
     %ul
       - x509_subject(signature.x509_certificate.subject, ["CN", "O"]).map do |key, value|
         %li= key + "=" + value

app/views/projects/commit/x509/_certificate_details.html.haml

@@ -1,3 +1,4 @@
+= render_if_exists 'projects/merge_requests/merge_trains_button'
 - if @can_bulk_update
   = render Pajamas::ButtonComponent.new(type: :submit, button_options: { class: 'gl-mr-3 js-bulk-update-toggle' }) do
     = _("Bulk edit")

app/views/projects/merge_requests/_nav_btns.html.haml

@@ -107,7 +107,7 @@
 
 #js-review-bar{ data: review_bar_data(@merge_request, current_user) }
 
-- if Feature.enabled?(:reviewer_assign_drawer, current_user, type: :wip)
+- if Feature.enabled?(:reviewer_assign_drawer, current_user, type: :beta)
   #js-reviewer-drawer-portal
 
 - if current_user && Feature.enabled?(:mr_experience_survey, current_user)

app/views/projects/merge_requests/_page.html.haml

@@ -80,4 +80,4 @@
                 = note.attachment_identifier
                 = link_to delete_attachment_project_note_path(note.project, note),
                   title: _('Delete this attachment'), method: :delete, remote: true, data: { confirm: _('Are you sure you want to remove the attachment?') }, class: 'danger js-note-attachment-delete' do
-                  = sprite_icon('remove', css_class: 'cred')
+                  = sprite_icon('remove', css_class: 'gl-text-danger')