Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.rubocop_todo/layout/line_continuation_spacing.yml

@@ -6,9 +6,6 @@ Layout/LineContinuationSpacing:
     - 'app/helpers/tags_helper.rb'
     - 'app/helpers/tree_helper.rb'
     - 'app/models/concerns/spammable.rb'
-    - 'app/models/work_items/parent_link.rb'
-    - 'app/services/feature_flags/update_service.rb'
-    - 'app/services/issues/build_service.rb'
     - 'app/services/merge_requests/merge_service.rb'
     - 'app/services/users/email_verification/validate_token_service.rb'
     - 'ee/app/controllers/ee/ldap/omniauth_callbacks_controller.rb'

GITALY_SERVER_VERSION

@@ -1 +1 @@
-1365200de8ffffff9a46f274e58fbd3956d16638
+d2a6fe593bb0ce9f364c5aa58b5158fa88a8b9ae

app/assets/javascripts/boards/boards_util.js

@@ -314,7 +314,7 @@ const parseFilters = (filters) => {
  * @param {Object} objParam.filterFields - data on what filters are available for given issuableType (based on GraphQL schema)
  */
 export const filterVariables = ({ filters, issuableType, filterInfo, filterFields, options }) => {
-  const customFields = new Map();
+  const customFieldRegex = /^custom-field\[(\d*)\]$/;
 
   return parseFilters(filters)
     .map(([k, v, negated]) => {
@@ -325,7 +325,7 @@ export const filterVariables = ({ filters, issuableType, filterInfo, filterField
       return [remappedKey, v, negated];
     })
     .filter(([k, , negated]) => {
-      if (k.startsWith('custom-field') && options.hasCustomFieldsFeature) {
+      if (k.match(customFieldRegex) && options.hasCustomFieldsFeature) {
         return true;
       }
 
@@ -347,22 +347,17 @@ export const filterVariables = ({ filters, issuableType, filterInfo, filterField
     .map(([k, v, negated]) => {
       let newK = k;
       let newV = v;
-      if (k.startsWith('custom-field') && options.hasCustomFieldsFeature) {
-        let customFieldId = k.replace('custom-field[', '').replace(']', '');
-        customFieldId = convertToGraphQLId(TYPENAME_CUSTOM_FIELD, customFieldId);
-
-        const existingSelectedOptions = customFields.has(customFieldId)
-          ? customFields.get(customFieldId)
-          : [];
-
-        const selectedOptionIds = [...existingSelectedOptions];
-        selectedOptionIds.push(convertToGraphQLId(TYPENAME_CUSTOM_FIELD_SELECT_OPTION, v));
-        customFields.set(customFieldId, selectedOptionIds);
-
+      if (k.match(customFieldRegex) && options.hasCustomFieldsFeature) {
+        const [, customFieldId] = customFieldRegex.exec(k);
         newV = [
           {
-            customFieldId,
-            selectedOptionIds,
+            customFieldId: convertToGraphQLId(TYPENAME_CUSTOM_FIELD, customFieldId),
+            selectedOptionIds: [
+              convertToGraphQLId(
+                TYPENAME_CUSTOM_FIELD_SELECT_OPTION,
+                Array.isArray(v) ? v[v.length - 1] : v,
+              ),
+            ],
           },
         ];
         newK = 'customField';

app/assets/javascripts/ci/job_details/components/root_cause_analysis_hotspot_experiment.vue

@@ -0,0 +1,4 @@
+<template>
+  <!--NOOP in FOSS-->
+  <div></div>
+</template>

app/assets/javascripts/ci/job_details/job_app.vue

@@ -5,7 +5,7 @@ import { throttle, isEmpty } from 'lodash';
 // eslint-disable-next-line no-restricted-imports
 import { mapGetters, mapState, mapActions } from 'vuex';
 import JobLogTopBar from 'ee_else_ce/ci/job_details/components/job_log_top_bar.vue';
-import RootCauseAnalysisButton from 'ee_else_ce/ci/job_details/components/root_cause_analysis_button.vue';
+import RootCauseAnalysisHotspotExperiment from 'ee_else_ce/ci/job_details/components/root_cause_analysis_hotspot_experiment.vue';
 import SafeHtml from '~/vue_shared/directives/safe_html';
 import glAbilitiesMixin from '~/vue_shared/mixins/gl_abilities_mixin';
 import { isScrolledToBottom } from '~/lib/utils/scroll_utils';
@@ -31,7 +31,7 @@ export default {
     GlIcon,
     Log,
     JobLogTopBar,
-    RootCauseAnalysisButton,
+    RootCauseAnalysisHotspotExperiment,
     StuckBlock,
     UnmetPrerequisitesBlock,
     Sidebar,
@@ -330,8 +330,8 @@ export default {
             class="rca-bar-component gl-fixed gl-px-5 gl-py-2 xl:gl-px-6"
             data-testid="rca-bar-component"
           >
-            <div class="gl-flex gl-w-full">
-              <root-cause-analysis-button
+            <div class="rca-bar-content gl-flex gl-w-full" data-testid="rca-bar-content">
+              <root-cause-analysis-hotspot-experiment
                 :job-id="job.id"
                 :job-status-group="job.status.group"
                 :can-troubleshoot-job="glAbilities.troubleshootJobWithAi"

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

@@ -7,15 +7,15 @@ import CiIcon from '~/vue_shared/components/ci_icon/ci_icon.vue';
 import SafeHtml from '~/vue_shared/directives/safe_html';
 import { BRIDGE_KIND, BUILD_KIND } from '~/ci/pipeline_details/graph/constants';
 import RetryMrFailedJobMutation from '~/ci/merge_requests/graphql/mutations/retry_mr_failed_job.mutation.graphql';
-import RootCauseAnalysisButton from 'ee_else_ce/ci/job_details/components/root_cause_analysis_button.vue';
+import RootCauseAnalysisHotspotExperiment from 'ee_else_ce/ci/job_details/components/root_cause_analysis_hotspot_experiment.vue';
 
 export default {
   components: {
     CiIcon,
     GlButton,
     GlLink,
     GlTooltip,
-    RootCauseAnalysisButton,
+    RootCauseAnalysisHotspotExperiment,
   },
   directives: {
     GlTooltip: GlTooltipDirective,
@@ -128,7 +128,7 @@ export default {
         {{ tooltipErrorText }}
       </gl-tooltip>
       <div class="col-4 gl-flex gl-max-w-full gl-flex-grow gl-justify-end gl-gap-3">
-        <root-cause-analysis-button
+        <root-cause-analysis-hotspot-experiment
           :job-gid="job.id"
           :job-status-group="statusGroup"
           :can-troubleshoot-job="canTroubleshootJob"

app/assets/stylesheets/components/rapid_diffs/_index.scss

@@ -2,3 +2,4 @@
 @import './diff_file_component';
 @import './text_file_viewers';
 @import './no_preview';
+@import './empty_state';

app/assets/stylesheets/components/rapid_diffs/empty_state.scss

@@ -0,0 +1,8 @@
+.rd-app-empty-state {
+  @apply gl-mt-5;
+  text-align: center;
+}
+
+.rd-app-empty-state-card {
+  @apply gl-bg-subtle;
+}

app/components/rapid_diffs/empty_state_component.html.haml

@@ -1,5 +1,5 @@
-.rd-app-empty-state.gl-mt-5.gl-text-center
-  = render Pajamas::CardComponent.new(card_options: { class: "gl-bg-subtle" }) do |c|
+.rd-app-empty-state
+  = render Pajamas::CardComponent.new(card_options: { class: "rd-app-empty-state-card" }) do |c|
     - c.with_body do
       = render Pajamas::EmptyStateComponent.new(svg_path: 'illustrations/empty-state/empty-commit-md.svg',
         title: message) do |c|

app/helpers/emails_helper.rb

@@ -24,7 +24,7 @@ def email_action(url)
   def action_title(url)
     return unless url
 
-    %w[merge_requests issues work_items commit].each do |action|
+    %w[merge_requests issues work_items commit wikis].each do |action|
       return "View #{action.humanize.singularize}" if url.split("/").include?(action)
     end
 

app/helpers/milestones_helper.rb

@@ -1,30 +1,7 @@
 # frozen_string_literal: true
 
 module MilestonesHelper
-  def milestone_header_class(primary, issuables)
-    header_color = milestone_header_color(primary: primary)
-    header_border = milestone_header_border(issuables)
-
-    "#{header_color} #{header_border} gl-flex"
-  end
-
-  def milestone_counter_class(primary)
-    primary ? 'gl-text-white' : 'gl-text-subtle'
-  end
-
   def milestone_issuable_group(issuable)
     (issuable.respond_to?(:namespace) && issuable.namespace.is_a?(Group) ? issuable.namespace : nil)
   end
-
-  private
-
-  def milestone_header_color(primary: false)
-    return '' unless primary
-
-    'gl-bg-blue-500 gl-text-white'
-  end
-
-  def milestone_header_border(issuables)
-    issuables.empty? ? 'gl-border-b-0 gl-rounded-base' : ''
-  end
 end

app/mailers/emails/notes.rb

@@ -59,6 +59,15 @@ def note_design_email(recipient_id, note_id, reason = nil)
       mail_answer_note_thread(design, @note, note_thread_options(reason))
     end
 
+    def note_wiki_page_email(recipient_id, note_id, reason = nil)
+      setup_note_mail(note_id, recipient_id)
+
+      @wiki_page = @note.noteable
+      @target_url = Gitlab::UrlBuilder.build(@wiki_page, **note_target_url_query_params)
+
+      mail_answer_note_thread(@wiki_page, @note, note_thread_options(reason))
+    end
+
     private
 
     def note_target_url_options

app/mailers/previews/notify_preview.rb

@@ -17,6 +17,27 @@ def note_merge_request_email_for_individual_note
     end
   end
 
+  def note_wiki_page_email_for_individual_note
+    note_email(:note_wiki_page_email) do
+      note = <<-MD.strip_heredoc
+        This is an individual note on a merge request :smiley:
+
+        In this notification email, we expect to see:
+
+        - The note contents (that's what you're looking at)
+        - A link to view this note on GitLab
+        - An explanation for why the user is receiving this notification
+      MD
+
+      create_note(
+        noteable_type: 'WikiPage::Meta',
+        noteable_id: wiki_page_meta.id,
+        note: note,
+        project: wiki_page_meta.project
+      )
+    end
+  end
+
   def new_user_email
     Notify.new_user_email(user.id).message
   end
@@ -517,6 +538,10 @@ def merge_request
     @merge_request ||= project.merge_requests.first
   end
 
+  def wiki_page_meta
+    @wiki_page_meta ||= WikiPage::Meta.last
+  end
+
   def milestone
     @milestone ||= issue.milestone
   end

app/models/cloud_connector/service_access_token.rb

@@ -19,9 +19,5 @@ class ServiceAccessToken < ApplicationRecord
     def expired?
       expires_at.past?
     end
-
-    def refresh_required?
-      expires_at < 2.days.from_now
-    end
   end
 end

app/models/wiki_page/meta.rb

@@ -164,6 +164,10 @@ def to_reference
       canonical_slug
     end
 
+    def reference_link_text
+      canonical_slug
+    end
+
     # Used by app/policies/todo_policy.rb
     def readable_by?(user)
       Ability.allowed?(user, :read_wiki, self)

app/models/work_items/parent_link.rb

@@ -64,7 +64,7 @@ def validate_confidentiality
 
       if work_item_parent.confidential? && !work_item.confidential?
         errors.add :work_item, format(
-          _("cannot assign a non-confidential %{work_item_type} to a confidential "\
+          _("cannot assign a non-confidential %{work_item_type} to a confidential " \
                     "parent. Make the %{work_item_type} confidential and try again."),
           work_item_type: work_item.work_item_type.name.downcase
         )

app/services/auto_merge/availability_check.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+module AutoMerge # rubocop:disable Gitlab/BoundedContexts -- Existing module
+  class AvailabilityCheck
+    ABORT_REASONS = {
+      forbidden: 'they do not have permission to merge the merge request.',
+      mergeability_checks_failed: ->(check) {
+        "the merge request cannot be merged. Failed mergeability check: #{check || 'unknown'}"
+      },
+      merge_trains_disabled: 'merge trains are disabled for this project.',
+      missing_diff_head_pipeline: 'the pipeline associated with this merge request is missing or out of sync.',
+      incomplete_diff_head_pipeline: 'the merge request currently has a pipeline in progress.',
+      default: 'this merge request cannot be added to the merge train.'
+    }.freeze
+
+    def self.success
+      new(
+        status: :available
+      )
+    end
+
+    def self.error(unavailable_reason:, unsuccessful_check: nil)
+      new(
+        status: :unavailable,
+        unavailable_reason: unavailable_reason,
+        unsuccessful_check: unsuccessful_check
+      )
+    end
+
+    attr_reader :status, :unavailable_reason, :unsuccessful_check
+
+    def initialize(status:, unavailable_reason: nil, unsuccessful_check: nil)
+      self.status = status
+      self.unavailable_reason = unavailable_reason
+      self.unsuccessful_check = unsuccessful_check
+    end
+
+    def available?
+      status == :available
+    end
+
+    def abort_message
+      message = ABORT_REASONS[unavailable_reason] || ABORT_REASONS[:default]
+      message.respond_to?(:call) ? message.call(unsuccessful_check) : message
+    end
+
+    private
+
+    attr_writer :status, :unavailable_reason, :unsuccessful_check
+  end
+end

app/services/auto_merge/base_service.rb

@@ -58,14 +58,33 @@ def abort(merge_request, reason)
 
     def available_for?(merge_request)
       strong_memoize("available_for_#{merge_request.id}") do
-        merge_request.can_be_merged_by?(current_user) &&
-          merge_request.mergeability_checks_pass?(**skippable_available_for_checks(merge_request)) &&
-          yield
+        availability_details(merge_request).available?
       end
     end
 
     private
 
+    def availability_details(merge_request)
+      strong_memoize("availability_details_#{merge_request.id}") do
+        unless merge_request.can_be_merged_by?(current_user)
+          next AutoMerge::AvailabilityCheck.error(unavailable_reason: :forbidden)
+        end
+
+        mergeability_checks = merge_request.execute_merge_checks(
+          MergeRequest.all_mergeability_checks,
+          params: skippable_available_for_checks(merge_request),
+          execute_all: false
+        )
+
+        unless mergeability_checks.success?
+          next AutoMerge::AvailabilityCheck.error(unavailable_reason: :mergeability_checks_failed,
+            unsuccessful_check: mergeability_checks.payload[:unsuccessful_check])
+        end
+
+        block_given? ? yield : AvailabilityCheck.success
+      end
+    end
+
     def skippable_available_for_checks(merge_request)
       merge_request.skipped_mergeable_checks(
         auto_merge_requested: true,

app/services/auto_merge/merge_when_checks_pass_service.rb

@@ -41,13 +41,16 @@ def abort(merge_request, reason)
       end
     end
 
-    override :available_for
-    def available_for?(merge_request)
+    # availability_details are responsible for validating whether the service is available_for a merge request and sets
+    # an unavailable_reason if it is not
+    override :availability_details
+    def availability_details(merge_request)
       super do
-        next false if merge_request.project.merge_trains_enabled?
-        next false if merge_request.mergeable? && !merge_request.diff_head_pipeline_considered_in_progress?
+        default_reason = AutoMerge::AvailabilityCheck.error(unavailable_reason: :default)
+        next default_reason if merge_request.project.merge_trains_enabled?
+        next default_reason if merge_request.mergeable? && !merge_request.diff_head_pipeline_considered_in_progress?
 
-        next true
+        AutoMerge::AvailabilityCheck.success
       end
     end
 

app/services/ci/create_pipeline_service.rb

@@ -16,6 +16,7 @@ class CreatePipelineService < BaseService
       Gitlab::Ci::Pipeline::Chain::AssignPartition,
       Gitlab::Ci::Pipeline::Chain::PipelineExecutionPolicies::EvaluatePolicies,
       Gitlab::Ci::Pipeline::Chain::Skip,
+      Gitlab::Ci::Pipeline::Chain::Validate::Config,
       Gitlab::Ci::Pipeline::Chain::Config::Content,
       Gitlab::Ci::Pipeline::Chain::Config::Process,
       Gitlab::Ci::Pipeline::Chain::StopLinting,