Add latest changes from gitlab-org/gitlab@master

.rubocop_todo/capybara/testid_finders.yml

@@ -1,26 +1,11 @@
 ---
 Capybara/TestidFinders:
   Exclude:
-    - 'spec/features/dashboard/projects_spec.rb'
-    - 'spec/features/dashboard/todos/todos_spec.rb'
-    - 'spec/features/groups/board_sidebar_spec.rb'
-    - 'spec/features/groups/board_spec.rb'
-    - 'spec/features/groups/clusters/user_spec.rb'
-    - 'spec/features/groups/dependency_proxy_spec.rb'
-    - 'spec/features/groups/group_settings_spec.rb'
-    - 'spec/features/groups/members/leave_group_spec.rb'
-    - 'spec/features/groups/members/manage_groups_spec.rb'
-    - 'spec/features/groups/members/master_adds_member_with_expiration_date_spec.rb'
-    - 'spec/features/groups/members/search_members_spec.rb'
-    - 'spec/features/groups/members/sort_members_spec.rb'
-    - 'spec/features/groups/members/tabs_spec.rb'
-    - 'spec/features/groups/merge_requests_spec.rb'
     - 'spec/features/issues/issue_sidebar_spec.rb'
     - 'spec/features/issues/issue_state_spec.rb'
     - 'spec/features/issues/user_creates_issue_spec.rb'
     - 'spec/features/issues/user_edits_issue_spec.rb'
     - 'spec/features/issues/user_resets_their_incoming_email_token_spec.rb'
-    - 'spec/features/issues/user_sees_live_update_spec.rb'
     - 'spec/features/issues/user_sees_sidebar_updates_in_realtime_spec.rb'
     - 'spec/features/issues/user_toggles_subscription_spec.rb'
     - 'spec/features/labels_hierarchy_spec.rb'
@@ -38,7 +23,6 @@ Capybara/TestidFinders:
     - 'spec/features/merge_request/user_merges_immediately_spec.rb'
     - 'spec/features/merge_request/user_posts_notes_spec.rb'
     - 'spec/features/merge_request/user_resolves_conflicts_spec.rb'
-    - 'spec/features/merge_request/user_reverts_merge_request_spec.rb'
     - 'spec/features/merge_request/user_sees_merge_widget_spec.rb'
     - 'spec/features/merge_request/user_sees_pipelines_spec.rb'
     - 'spec/features/merge_request/user_sees_suggest_pipeline_spec.rb'
@@ -47,7 +31,6 @@ Capybara/TestidFinders:
     - 'spec/features/merge_request/user_toggles_whitespace_changes_spec.rb'
     - 'spec/features/merge_request/user_views_open_merge_request_spec.rb'
     - 'spec/features/milestone_spec.rb'
-    - 'spec/features/nav/new_nav_callout_spec.rb'
     - 'spec/features/nav/pinned_nav_items_spec.rb'
     - 'spec/features/populate_new_pipeline_vars_with_params_spec.rb'
     - 'spec/features/profile_spec.rb'
@@ -61,7 +44,6 @@ Capybara/TestidFinders:
     - 'spec/features/profiles/user_edit_profile_spec.rb'
     - 'spec/features/profiles/user_updates_comment_template_spec.rb'
     - 'spec/features/project_group_variables_spec.rb'
-    - 'spec/features/project_variables_spec.rb'
     - 'spec/features/projects/blobs/blame_spec.rb'
     - 'spec/features/projects/branches/user_deletes_branch_spec.rb'
     - 'spec/features/projects/branches_spec.rb'
@@ -76,7 +58,6 @@ Capybara/TestidFinders:
     - 'spec/features/projects/environments/environment_spec.rb'
     - 'spec/features/projects/environments/environments_spec.rb'
     - 'spec/features/projects/feature_flags/user_sees_feature_flag_list_spec.rb'
-    - 'spec/features/projects/features_visibility_spec.rb'
     - 'spec/features/projects/fork_spec.rb'
     - 'spec/features/projects/integrations/user_activates_jira_spec.rb'
     - 'spec/features/projects/issues/design_management/user_views_designs_with_svg_xss_spec.rb'
@@ -111,7 +92,6 @@ Capybara/TestidFinders:
     - 'spec/features/projects/terraform_spec.rb'
     - 'spec/features/projects/tree/create_directory_spec.rb'
     - 'spec/features/projects/tree/create_file_spec.rb'
-    - 'spec/features/projects/user_uses_shortcuts_spec.rb'
     - 'spec/features/projects/work_items/work_item_children_spec.rb'
     - 'spec/features/projects/work_items/work_item_spec.rb'
     - 'spec/features/protected_branches_spec.rb'
@@ -121,10 +101,8 @@ Capybara/TestidFinders:
     - 'spec/features/search/user_searches_for_merge_requests_spec.rb'
     - 'spec/features/search/user_searches_for_milestones_spec.rb'
     - 'spec/features/search/user_searches_for_wiki_pages_spec.rb'
-    - 'spec/features/search/user_uses_header_search_field_spec.rb'
     - 'spec/features/search/user_uses_search_filters_spec.rb'
     - 'spec/features/tags/developer_deletes_tag_spec.rb'
     - 'spec/features/tags/maintainer_deletes_protected_tag_spec.rb'
     - 'spec/features/triggers_spec.rb'
-    - 'spec/features/uploads/user_uploads_avatar_to_profile_spec.rb'
     - 'spec/features/user_sees_revert_modal_spec.rb'

.rubocop_todo/gitlab/namespaced_class.yml

@@ -250,7 +250,6 @@ Gitlab/NamespacedClass:
     - 'app/models/plan.rb'
     - 'app/models/plan_limits.rb'
     - 'app/models/pool_repository.rb'
-    - 'app/models/product_analytics_event.rb'
     - 'app/models/programming_language.rb'
     - 'app/models/project.rb'
     - 'app/models/project_authorization.rb'

.rubocop_todo/layout/empty_line_after_magic_comment.yml

@@ -581,7 +581,6 @@ Layout/EmptyLineAfterMagicComment:
     - 'spec/models/packages/rpm/repository_file_spec.rb'
     - 'spec/models/packages/rubygems/metadatum_spec.rb'
     - 'spec/models/packages/tag_spec.rb'
-    - 'spec/models/product_analytics_event_spec.rb'
     - 'spec/policies/design_management/design_policy_spec.rb'
     - 'spec/requests/api/composer_packages_spec.rb'
     - 'spec/requests/api/conan_project_packages_spec.rb'

.rubocop_todo/rspec/context_wording.yml

@@ -1994,7 +1994,6 @@ RSpec/ContextWording:
     - 'spec/lib/object_storage/direct_upload_spec.rb'
     - 'spec/lib/omni_auth/strategies/jwt_spec.rb'
     - 'spec/lib/peek/views/bullet_detailed_spec.rb'
-    - 'spec/lib/product_analytics/event_params_spec.rb'
     - 'spec/lib/safe_zip/entry_spec.rb'
     - 'spec/lib/security/ci_configuration/container_scanning_build_action_spec.rb'
     - 'spec/lib/security/ci_configuration/sast_build_action_spec.rb'

.rubocop_todo/rspec/feature_category.yml

@@ -4223,7 +4223,6 @@ RSpec/FeatureCategory:
     - 'spec/lib/peek/views/external_http_spec.rb'
     - 'spec/lib/peek/views/memory_spec.rb'
     - 'spec/lib/peek/views/redis_detailed_spec.rb'
-    - 'spec/lib/product_analytics/event_params_spec.rb'
     - 'spec/lib/prometheus/cleanup_multiproc_dir_service_spec.rb'
     - 'spec/lib/prometheus/pid_provider_spec.rb'
     - 'spec/lib/quality/seeders/issues_spec.rb'
@@ -4709,7 +4708,6 @@ RSpec/FeatureCategory:
     - 'spec/models/preloaders/project_root_ancestor_preloader_spec.rb'
     - 'spec/models/preloaders/user_max_access_level_in_groups_preloader_spec.rb'
     - 'spec/models/preloaders/user_max_access_level_in_projects_preloader_spec.rb'
-    - 'spec/models/product_analytics_event_spec.rb'
     - 'spec/models/programming_language_spec.rb'
     - 'spec/models/project_authorization_spec.rb'
     - 'spec/models/project_auto_devops_spec.rb'

.rubocop_todo/rspec/named_subject.yml

@@ -473,7 +473,6 @@ RSpec/NamedSubject:
     - 'ee/spec/lib/gitlab/llm/chat_message_spec.rb'
     - 'ee/spec/lib/gitlab/llm/chat_storage_spec.rb'
     - 'ee/spec/lib/gitlab/llm/completions/chat_spec.rb'
-    - 'ee/spec/lib/gitlab/llm/concerns/circuit_breaker_spec.rb'
     - 'ee/spec/lib/gitlab/llm/concerns/exponential_backoff_spec.rb'
     - 'ee/spec/lib/gitlab/llm/graphql_subscription_response_service_spec.rb'
     - 'ee/spec/lib/gitlab/llm/templates/categorize_question_spec.rb'
@@ -2503,7 +2502,6 @@ RSpec/NamedSubject:
     - 'spec/lib/peek/views/external_http_spec.rb'
     - 'spec/lib/peek/views/memory_spec.rb'
     - 'spec/lib/peek/views/redis_detailed_spec.rb'
-    - 'spec/lib/product_analytics/event_params_spec.rb'
     - 'spec/lib/quality/seeders/issues_spec.rb'
     - 'spec/lib/release_highlights/validator/entry_spec.rb'
     - 'spec/lib/release_highlights/validator_spec.rb'
@@ -3437,8 +3435,6 @@ RSpec/NamedSubject:
     - 'spec/services/personal_access_tokens/last_used_service_spec.rb'
     - 'spec/services/personal_access_tokens/revoke_service_spec.rb'
     - 'spec/services/post_receive_service_spec.rb'
-    - 'spec/services/product_analytics/build_activity_graph_service_spec.rb'
-    - 'spec/services/product_analytics/build_graph_service_spec.rb'
     - 'spec/services/projects/alerting/notify_service_spec.rb'
     - 'spec/services/projects/all_issues_count_service_spec.rb'
     - 'spec/services/projects/all_merge_requests_count_service_spec.rb'

.rubocop_todo/style/inline_disable_annotation.yml

@@ -2081,7 +2081,6 @@ Style/InlineDisableAnnotation:
     - 'ee/spec/lib/gitlab/import_export/project/relation_factory_spec.rb'
     - 'ee/spec/lib/gitlab/llm/chain/agents/zero_shot/executor_real_requests_spec.rb'
     - 'ee/spec/lib/gitlab/llm/chain/tools/epic_identifier/executor_spec.rb'
-    - 'ee/spec/lib/gitlab/llm/concerns/circuit_breaker_spec.rb'
     - 'ee/spec/lib/gitlab/mirror_spec.rb'
     - 'ee/spec/lib/gitlab/patch/database_config_spec.rb'
     - 'ee/spec/lib/gitlab/sitemaps/sitemap_file_spec.rb'

app/assets/javascripts/ci/catalog/components/list/catalog_header.vue

@@ -2,6 +2,7 @@
 import { GlBanner, GlLink } from '@gitlab/ui';
 import { __, s__ } from '~/locale';
 import { helpPagePath } from '~/helpers/help_page_helper';
+import BetaBadge from '~/vue_shared/components/badges/beta_badge.vue';
 import { CATALOG_FEEDBACK_DISMISSED_KEY } from '../../constants';
 
 const defaultTitle = __('CI/CD Catalog');
@@ -11,6 +12,7 @@ const defaultDescription = s__(
 
 export default {
   components: {
+    BetaBadge,
     GlBanner,
     GlLink,
   },
@@ -58,7 +60,10 @@ export default {
         {{ $options.i18n.banner.description }}
       </p>
     </gl-banner>
-    <h1 class="page-title gl-font-size-h-display">{{ pageTitle }}</h1>
+    <div class="gl-my-4 gl-display-flex gl-align-items-center">
+      <h1 class="gl-m-0 gl-font-size-h-display">{{ pageTitle }}</h1>
+      <beta-badge class="gl-ml-3" />
+    </div>
     <p>
       <span data-testid="page-description">{{ pageDescription }}</span>
       <gl-link :href="$options.learnMorePath" target="_blank">{{

app/assets/javascripts/clone_panel.js

@@ -14,7 +14,7 @@ export default function initClonePanel() {
       $(`a:contains('${selectedCloneOption}')`, $cloneOptions).addClass('is-active');
     }
 
-    $('a', $cloneOptions).on('click', (e) => {
+    $('.js-clone-links a', $cloneOptions).on('click', (e) => {
       const $this = $(e.currentTarget);
       const url = $this.attr('href');
       if (

app/assets/javascripts/environments/folder/environments_folder_app.vue

@@ -0,0 +1,21 @@
+<script>
+import { s__ } from '~/locale';
+
+export default {
+  props: {
+    folderName: {
+      type: String,
+      required: true,
+    },
+  },
+  i18n: {
+    pageTitle: s__('Environments|Environments'),
+  },
+};
+</script>
+<template>
+  <h4 class="gl-font-weight-normal" data-testid="folder-name">
+    {{ $options.i18n.pageTitle }} /
+    <b>{{ folderName }}</b>
+  </h4>
+</template>

app/assets/javascripts/environments/folder/environments_folder_bundle.js

@@ -2,7 +2,8 @@ import Vue from 'vue';
 import VueApollo from 'vue-apollo';
 import createDefaultClient from '~/lib/graphql';
 import Translate from '~/vue_shared/translate';
-import EnvironmentsFolderApp from './environments_folder_view.vue';
+import EnvironmentsFolderView from './environments_folder_view.vue';
+import EnvironmentsFolderApp from './environments_folder_app.vue';
 
 Vue.use(Translate);
 Vue.use(VueApollo);
@@ -13,27 +14,43 @@ const apolloProvider = new VueApollo({
 
 export default () => {
   const el = document.getElementById('environments-folder-list-view');
+  const environmentsData = el.dataset;
+  if (gon.features.environmentsFolderNewLook) {
+    const folderName = environmentsData.environmentsDataFolderName;
+
+    return new Vue({
+      el,
+      components: {
+        EnvironmentsFolderApp,
+      },
+      render(createElement) {
+        return createElement('environments-folder-app', {
+          props: {
+            folderName,
+          },
+        });
+      },
+    });
+  }
 
   return new Vue({
     el,
     components: {
-      EnvironmentsFolderApp,
+      EnvironmentsFolderView,
     },
     apolloProvider,
     provide: {
       projectPath: el.dataset.projectPath,
     },
     data() {
-      const environmentsData = el.dataset;
-
       return {
         endpoint: environmentsData.environmentsDataEndpoint,
         folderName: environmentsData.environmentsDataFolderName,
         cssContainerClass: environmentsData.cssClass,
       };
     },
     render(createElement) {
-      return createElement('environments-folder-app', {
+      return createElement('environments-folder-view', {
         props: {
           endpoint: this.endpoint,
           folderName: this.folderName,

app/assets/javascripts/environments/graphql/resolvers/kubernetes.js

@@ -10,6 +10,7 @@ import produce from 'immer';
 import {
   getK8sPods,
   handleClusterError,
+  buildWatchPath,
 } from '~/kubernetes_dashboard/graphql/helpers/resolver_helpers';
 import { humanizeClusterErrors } from '../../helpers/k8s_integration_helper';
 import k8sPodsQuery from '../queries/k8s_pods.query.graphql';
@@ -62,9 +63,7 @@ const mapWorkloadItems = (items, kind) => {
 const watchWorkloadItems = ({ kind, apiVersion, configuration, namespace, client }) => {
   const itemKind = kind.toLowerCase().replace('list', 's');
 
-  const path = namespace
-    ? `/apis/${apiVersion}/namespaces/${namespace}/${itemKind}`
-    : `/apis/${apiVersion}/${itemKind}`;
+  const path = buildWatchPath({ resource: itemKind, api: `apis/${apiVersion}`, namespace });
   const config = new Configuration(configuration);
   const watcherApi = new WatchApi(config);
 
@@ -113,7 +112,7 @@ const mapServicesItems = (items) => {
 };
 
 const watchServices = ({ configuration, namespace, client }) => {
-  const path = namespace ? `/api/v1/namespaces/${namespace}/services` : '/api/v1/services';
+  const path = buildWatchPath({ resource: 'services', namespace });
   const config = new Configuration(configuration);
   const watcherApi = new WatchApi(config);
 

app/assets/javascripts/gfm_auto_complete.js

@@ -262,6 +262,38 @@ class GfmAutoComplete {
     });
   }
 
+  // eslint-disable-next-line class-methods-use-this
+  setSubmitReviewStates($input) {
+    if (!window.gon.features?.mrRequestChanges) return;
+
+    const REVIEW_STATES = {
+      reviewed: {
+        header: __('Comment'),
+        description: __('Submit general feedback without explicit approval.'),
+      },
+      approve: {
+        header: __('Approve'),
+        description: __('Submit feedback and approve these changes.'),
+      },
+      requested_changes: {
+        header: __('Request changes'),
+        description: __('Submit feedback that should be addressed before merging.'),
+      },
+    };
+
+    $input.filter('[data-supports-quick-actions="true"]').atwho({
+      // Always keep the trailing space otherwise the command won't display correctly
+      at: '/submit_review ',
+      alias: 'submit_review',
+      data: Object.keys(REVIEW_STATES),
+      displayTpl({ name }) {
+        const reviewState = REVIEW_STATES[name];
+
+        return `<li><span class="gl-font-weight-bold gl-display-block">${reviewState.header}</span><small class="description gl-display-block gl-w-full gl-float-left! gl-px-0!">${reviewState.description}</small></li>`;
+      },
+    });
+  }
+
   setupEmoji($input) {
     const fetchData = this.fetchData.bind(this);
 
@@ -851,6 +883,9 @@ class GfmAutoComplete {
     } else if (dataSource) {
       AjaxCache.retrieve(dataSource, true)
         .then((data) => {
+          if (data.some((c) => c.name === 'submit_review')) {
+            this.setSubmitReviewStates($input);
+          }
           this.loadData($input, at, data);
         })
         .catch(() => {

app/assets/javascripts/kubernetes_dashboard/graphql/helpers/resolver_helpers.js

@@ -9,8 +9,12 @@ export const handleClusterError = async (err) => {
   throw errorData;
 };
 
+export const buildWatchPath = ({ resource, api = 'api/v1', namespace = '' }) => {
+  return namespace ? `/${api}/namespaces/${namespace}/${resource}` : `/${api}/${resource}`;
+};
+
 export const watchPods = ({ client, query, configuration, namespace }) => {
-  const path = namespace ? `/api/v1/namespaces/${namespace}/pods` : '/api/v1/pods';
+  const path = buildWatchPath({ resource: 'pods', namespace });
   const config = new Configuration(configuration);
   const watcherApi = new WatchApi(config);
 

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

@@ -38,9 +38,7 @@ export default {
   },
   computed: {
     showAiActions() {
-      return (
-        this.resourceGlobalId && this.glFeatures.aiGlobalSwitch && this.glFeatures.summarizeNotes
-      );
+      return this.resourceGlobalId && this.glFeatures.summarizeNotes;
     },
   },
 };

app/assets/javascripts/search/sidebar/components/app.vue

@@ -67,10 +67,7 @@ export default {
       return this.currentScope === SCOPE_MILESTONES;
     },
     showWikiBlobsFilters() {
-      return (
-        this.currentScope === SCOPE_WIKI_BLOBS &&
-        this.glFeatures?.searchProjectWikisHideArchivedProjects
-      );
+      return this.currentScope === SCOPE_WIKI_BLOBS;
     },
   },
   methods: {

app/assets/stylesheets/page_bundles/project.scss

@@ -53,7 +53,7 @@
     }
   }
 
-  .project-clone-holder {
+  .project-code-holder {
     display: inline-block;
     margin: $gl-padding 0 0;