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