.gitlab/ci/as-if-foss.gitlab-ci.yml

@@ -67,6 +67,10 @@ start-as-if-foss:
   variables:
     START_AS_IF_FOSS: $START_AS_IF_FOSS
     RUBY_VERSION: $RUBY_VERSION
+    # Fake merge request variables to make `detect-tests` work from FOSS
+    CI_MERGE_REQUEST_PROJECT_PATH: $CI_MERGE_REQUEST_PROJECT_PATH
+    CI_MERGE_REQUEST_IID: $CI_MERGE_REQUEST_IID
+    # Enabling each individual jobs
     ENABLE_RSPEC: $ENABLE_RSPEC
     ENABLE_RSPEC_FAST_SPEC_HELPER: $ENABLE_RSPEC_FAST_SPEC_HELPER
     ENABLE_RSPEC_PRAEFECT: $ENABLE_RSPEC_PRAEFECT
@@ -85,11 +89,13 @@ start-as-if-foss:
     ENABLE_COMPILE_STORYBOOK: $ENABLE_COMPILE_STORYBOOK
     ENABLE_COMPILE_TEST_ASSETS: $ENABLE_COMPILE_TEST_ASSETS
     ENABLE_CACHE_ASSETS: $ENABLE_CACHE_ASSETS
+    ENABLE_DETECT_TESTS: $ENABLE_DETECT_TESTS
     ENABLE_ESLINT: $ENABLE_ESLINT
     ENABLE_GENERATE_APOLLO_GRAPHQL_SCHEMA: $ENABLE_GENERATE_APOLLO_GRAPHQL_SCHEMA
     ENABLE_GRAPHQL_SCHEMA_DUMP: $ENABLE_GRAPHQL_SCHEMA_DUMP
     ENABLE_JEST: $ENABLE_JEST
     ENABLE_JEST_INTEGRATION: $ENABLE_JEST_INTEGRATION
+    ENABLE_RUBOCOP: $ENABLE_RUBOCOP
     ENABLE_QA_INTERNAL: $ENABLE_QA_INTERNAL
     ENABLE_QA_SELECTORS: $ENABLE_QA_SELECTORS
     ENABLE_STATIC_ANALYSIS: $ENABLE_STATIC_ANALYSIS

.gitlab/ci/database.gitlab-ci.yml

@@ -58,6 +58,12 @@ db:migrate:multi-version-upgrade:
     - psql --output /dev/null -v "ON_ERROR_STOP=1" -h postgres -U postgres -d gitlabhq_test < gitlabhq_production
     - bundle exec rake gitlab:db:configure
 
+# Validate minimum PG version supported by GitLab
+db:migrate:multi-version-upgrade-pg13:
+  extends:
+    - db:migrate:multi-version-upgrade
+    - .use-pg13
+
 db:migrate:reset:
   extends: .db-job-base
   script:

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

@@ -5,7 +5,7 @@ workflow:
   name: $PIPELINE_NAME
 
 include:
-  - component: "gitlab.com/gitlab-org/quality/pipeline-common/allure-report@8.3.0"
+  - component: "gitlab.com/gitlab-org/quality/pipeline-common/allure-report@8.5.1"
     inputs:
       job_name: "e2e-test-report"
       job_stage: "report"

.gitlab/ci/rules.gitlab-ci.yml

@@ -2205,6 +2205,7 @@
 
 .rails:rules:detect-tests:
   rules:
+    - if: '$ENABLE_DETECT_TESTS == "true"'
     - <<: *if-merge-request-labels-run-all-rspec
     - <<: *if-merge-request
       changes: *code-backstage-qa-patterns
@@ -2347,6 +2348,7 @@
 
 .static-analysis:rules:rubocop:
   rules:
+    - if: '$ENABLE_RUBOCOP == "true"'
     - <<: *if-default-refs
       changes: *rubocop-patterns
       variables:

.rubocop_todo/layout/argument_alignment.yml

@@ -1203,7 +1203,6 @@ Layout/ArgumentAlignment:
     - 'spec/lib/feature/definition_spec.rb'
     - 'spec/lib/feature/gitaly_spec.rb'
     - 'spec/lib/feature_spec.rb'
-    - 'spec/lib/generators/gitlab/partitioning/foreign_keys_generator_spec.rb'
     - 'spec/lib/gitlab/checks/changes_access_spec.rb'
     - 'spec/lib/gitlab/checks/single_change_access_spec.rb'
     - 'spec/lib/gitlab/conan_token_spec.rb'

.rubocop_todo/layout/line_end_string_concatenation_indentation.yml

@@ -215,7 +215,6 @@ Layout/LineEndStringConcatenationIndentation:
     - 'rubocop/cop/redis_queue_usage.rb'
     - 'rubocop/cop/rspec/factory_bot/inline_association.rb'
     - 'rubocop/cop/rspec/factory_bot/strategy_in_callback.rb'
-    - 'rubocop/cop/rspec/have_gitlab_http_status.rb'
     - 'rubocop/cop/sidekiq_api_usage.rb'
     - 'rubocop/cop/user_admin.rb'
     - 'scripts/lib/glfm/parse_examples.rb'

.rubocop_todo/lint/redundant_dir_glob_sort.yml

----
-# Cop supports --autocorrect.
-Lint/RedundantDirGlobSort:
-  Exclude:
-    - 'app/models/release_highlight.rb'
-    - 'config/application.rb'
-    - 'ee/spec/spec_helper.rb'
-    - 'qa/qa/specs/spec_helper.rb'
-    - 'spec/spec_helper.rb'

.rubocop_todo/lint/redundant_safe_navigation.yml

----
-# Cop supports --autocorrect.
-Lint/RedundantSafeNavigation:
-  Exclude:
-    - 'app/controllers/import/base_controller.rb'
-    - 'app/graphql/resolvers/users_resolver.rb'
-    - 'app/graphql/types/countable_connection_type.rb'
-    - 'app/helpers/search_helper.rb'
-    - 'ee/app/graphql/ee/types/issue_connection_type.rb'
-    - 'ee/app/models/search/namespace_index_assignment.rb'
-    - 'lib/api/projects.rb'
-    - 'lib/sidebars/projects/menus/infrastructure_menu.rb'
-    - 'spec/lib/gitlab/redis/multi_store_spec.rb'

.rubocop_todo/rspec/before_all_role_assignment.yml

@@ -332,7 +332,6 @@ RSpec/BeforeAllRoleAssignment:
     - 'ee/spec/policies/incident_management/oncall_schedule_policy_spec.rb'
     - 'ee/spec/policies/incident_management/oncall_shift_policy_spec.rb'
     - 'ee/spec/policies/issue_policy_spec.rb'
-    - 'ee/spec/policies/merge_request/diff_llm_summary_policy_spec.rb'
     - 'ee/spec/policies/merge_request_policy_spec.rb'
     - 'ee/spec/policies/merge_requests/external_status_check_policy_spec.rb'
     - 'ee/spec/policies/packages/policies/project_policy_spec.rb'
@@ -672,7 +671,6 @@ RSpec/BeforeAllRoleAssignment:
     - 'ee/spec/services/llm/generate_description_service_spec.rb'
     - 'ee/spec/services/llm/generate_summary_service_spec.rb'
     - 'ee/spec/services/llm/git_command_service_spec.rb'
-    - 'ee/spec/services/llm/merge_requests/summarize_diff_service_spec.rb'
     - 'ee/spec/services/llm/merge_requests/summarize_review_service_spec.rb'
     - 'ee/spec/services/members/activate_service_spec.rb'
     - 'ee/spec/services/merge_trains/create_pipeline_service_spec.rb'

.rubocop_todo/rspec/feature_category.yml

@@ -837,7 +837,6 @@ RSpec/FeatureCategory:
     - 'ee/spec/lib/gitlab/status_page/storage/s3_client_spec.rb'
     - 'ee/spec/lib/gitlab/status_page/storage/s3_multipart_upload_spec.rb'
     - 'ee/spec/lib/gitlab/status_page/storage_spec.rb'
-    - 'ee/spec/lib/gitlab/status_page/usage_data_counters/incident_counter_spec.rb'
     - 'ee/spec/lib/gitlab/status_page_spec.rb'
     - 'ee/spec/lib/gitlab/subscription_portal/client_spec.rb'
     - 'ee/spec/lib/gitlab/template/custom_templates_spec.rb'
@@ -2820,13 +2819,11 @@ RSpec/FeatureCategory:
     - 'spec/lib/gitlab/ci/build/port_spec.rb'
     - 'spec/lib/gitlab/ci/build/prerequisite/factory_spec.rb'
     - 'spec/lib/gitlab/ci/build/prerequisite/kubernetes_namespace_spec.rb'
-    - 'spec/lib/gitlab/ci/build/releaser_spec.rb'
     - 'spec/lib/gitlab/ci/build/rules/rule/clause/changes_spec.rb'
     - 'spec/lib/gitlab/ci/build/rules/rule/clause_spec.rb'
     - 'spec/lib/gitlab/ci/build/rules/rule_spec.rb'
     - 'spec/lib/gitlab/ci/build/rules_spec.rb'
     - 'spec/lib/gitlab/ci/build/status/reason_spec.rb'
-    - 'spec/lib/gitlab/ci/build/step_spec.rb'
     - 'spec/lib/gitlab/ci/charts_spec.rb'
     - 'spec/lib/gitlab/ci/config/edge_stages_injector_spec.rb'
     - 'spec/lib/gitlab/ci/config/entry/allow_failure_spec.rb'
@@ -4919,7 +4916,6 @@ RSpec/FeatureCategory:
     - 'spec/rubocop/cop/rspec/factory_bot/avoid_create_spec.rb'
     - 'spec/rubocop/cop/rspec/factory_bot/inline_association_spec.rb'
     - 'spec/rubocop/cop/rspec/factory_bot/strategy_in_callback_spec.rb'
-    - 'spec/rubocop/cop/rspec/have_gitlab_http_status_spec.rb'
     - 'spec/rubocop/cop/rspec/modify_sidekiq_middleware_spec.rb'
     - 'spec/rubocop/cop/rspec/top_level_describe_path_spec.rb'
     - 'spec/rubocop/cop/rspec/web_mock_enable_spec.rb'
@@ -5096,7 +5092,6 @@ RSpec/FeatureCategory:
     - 'spec/serializers/paginated_diff_entity_spec.rb'
     - 'spec/serializers/personal_access_token_entity_spec.rb'
     - 'spec/serializers/personal_access_token_serializer_spec.rb'
-    - 'spec/serializers/pipeline_serializer_spec.rb'
     - 'spec/serializers/project_access_token_entity_spec.rb'
     - 'spec/serializers/project_access_token_serializer_spec.rb'
     - 'spec/serializers/project_mirror_serializer_spec.rb'

.rubocop_todo/rspec/named_subject.yml

@@ -468,13 +468,11 @@ RSpec/NamedSubject:
     - 'ee/spec/lib/gitlab/llm/templates/explain_vulnerability_spec.rb'
     - 'ee/spec/lib/gitlab/llm/templates/fill_in_merge_request_template_spec.rb'
     - 'ee/spec/lib/gitlab/llm/templates/generate_commit_message_spec.rb'
-    - 'ee/spec/lib/gitlab/llm/templates/summarize_merge_request_spec.rb'
     - 'ee/spec/lib/gitlab/llm/templates/summarize_review_spec.rb'
     - 'ee/spec/lib/gitlab/llm/templates/summarize_submitted_review_spec.rb'
     - 'ee/spec/lib/gitlab/llm/vertex_ai/completions/analyze_ci_job_failure_spec.rb'
     - 'ee/spec/lib/gitlab/llm/vertex_ai/completions/fill_in_merge_request_template_spec.rb'
     - 'ee/spec/lib/gitlab/llm/vertex_ai/completions/generate_commit_message_spec.rb'
-    - 'ee/spec/lib/gitlab/llm/vertex_ai/completions/summarize_merge_request_spec.rb'
     - 'ee/spec/lib/gitlab/llm/vertex_ai/completions/summarize_review_spec.rb'
     - 'ee/spec/lib/gitlab/llm/vertex_ai/completions/summarize_submitted_review_spec.rb'
     - 'ee/spec/lib/gitlab/llm/vertex_ai/model_configurations/base_spec.rb'

.rubocop_todo/style/inline_disable_annotation.yml

@@ -1427,7 +1427,6 @@ Style/InlineDisableAnnotation:
     - 'ee/app/models/iteration.rb'
     - 'ee/app/models/license.rb'
     - 'ee/app/models/members/member_role.rb'
-    - 'ee/app/models/merge_request/diff_llm_summary.rb'
     - 'ee/app/models/merge_request/predictions.rb'
     - 'ee/app/models/merge_request/review_llm_summary.rb'
     - 'ee/app/models/merge_requests/compliance_violation.rb'
@@ -1441,7 +1440,6 @@ Style/InlineDisableAnnotation:
     - 'ee/app/models/search/namespace_index_assignment.rb'
     - 'ee/app/models/security/training.rb'
     - 'ee/app/models/vulnerabilities/finding.rb'
-    - 'ee/app/policies/merge_request/diff_llm_summary_policy.rb'
     - 'ee/app/policies/merge_request/review_llm_summary_policy.rb'
     - 'ee/app/policies/merge_request_diff_policy.rb'
     - 'ee/app/policies/path_lock_policy.rb'
@@ -1869,7 +1867,6 @@ Style/InlineDisableAnnotation:
     - 'ee/lib/gitlab/llm/chat_storage.rb'
     - 'ee/lib/gitlab/llm/open_ai/client.rb'
     - 'ee/lib/gitlab/llm/templates/explain_vulnerability.rb'
-    - 'ee/lib/gitlab/llm/vertex_ai/completions/summarize_merge_request.rb'
     - 'ee/lib/gitlab/llm/vertex_ai/completions/summarize_submitted_review.rb'
     - 'ee/lib/gitlab/middleware/ip_restrictor.rb'
     - 'ee/lib/gitlab/path_locks_finder.rb'

.rubocop_todo/style/lambda.yml

@@ -54,7 +54,6 @@ Style/Lambda:
     - 'lib/gitlab/utils/usage_data.rb'
     - 'qa/qa/runtime/allure_report.rb'
     - 'rubocop/cop/inject_enterprise_edition_module.rb'
-    - 'rubocop/cop/rspec/have_gitlab_http_status.rb'
     - 'spec/controllers/concerns/routable_actions_spec.rb'
     - 'spec/features/groups/dependency_proxy_for_containers_spec.rb'
     - 'spec/graphql/types/base_object_spec.rb'

Gemfile

@@ -135,7 +135,7 @@ gem 'net-ldap', '~> 0.17.1' # rubocop:todo Gemfile/MissingFeatureCategory
 # API
 gem 'grape', '~> 2.0.0', feature_category: :api
 gem 'grape-entity', '~> 0.10.2', feature_category: :api
-gem 'grape-swagger', '~> 2.0.1', group: [:development, :test], feature_category: :api
+gem 'grape-swagger', '~> 2.0.2', group: [:development, :test], feature_category: :api
 gem 'grape-swagger-entity', '~> 0.5.1', group: [:development, :test], feature_category: :api
 gem 'grape-path-helpers', '~> 2.0.1', feature_category: :api
 gem 'rack-cors', '~> 2.0.1', require: 'rack/cors' # rubocop:todo Gemfile/MissingFeatureCategory
@@ -528,7 +528,7 @@ group :test do
   # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527
   gem 'derailed_benchmarks', require: false # rubocop:todo Gemfile/MissingFeatureCategory
 
-  gem 'gitlab_quality-test_tooling', '~> 1.21.0', require: false, feature_category: :tooling
+  gem 'gitlab_quality-test_tooling', '~> 1.21.1', require: false, feature_category: :tooling
 end
 
 gem 'octokit', '~> 8.0', feature_category: :importers

Gemfile.checksum

@@ -226,7 +226,7 @@
 {"name":"gitlab-styles","version":"11.0.0","platform":"ruby","checksum":"0dd8ec066ce9955ac51d3616c6bfded30f75bb526f39ff392ece6f43d5b9406b"},
 {"name":"gitlab_chronic_duration","version":"0.12.0","platform":"ruby","checksum":"0d766944d415b5c831f176871ee8625783fc0c5bfbef2d79a3a616f207ffc16d"},
 {"name":"gitlab_omniauth-ldap","version":"2.2.0","platform":"ruby","checksum":"bb4d20acb3b123ed654a8f6a47d3fac673ece7ed0b6992edb92dca14bad2838c"},
-{"name":"gitlab_quality-test_tooling","version":"1.21.0","platform":"ruby","checksum":"b83555c80cffe5ef2709eb6e8674a4942c1bd44a47abea83effc19908d5a0b2c"},
+{"name":"gitlab_quality-test_tooling","version":"1.21.1","platform":"ruby","checksum":"83f2a115d21e921b0b540ba87765cad98f0766178244abc3d06d18dd1bd58ebc"},
 {"name":"globalid","version":"1.1.0","platform":"ruby","checksum":"b337e1746f0c8cb0a6c918234b03a1ddeb4966206ce288fbb57779f59b2d154f"},
 {"name":"gon","version":"6.4.0","platform":"ruby","checksum":"e3a618d659392890f1aa7db420f17c75fd7d35aeb5f8fe003697d02c4b88d2f0"},
 {"name":"google-apis-androidpublisher_v3","version":"0.34.0","platform":"ruby","checksum":"d7e1d7dd92f79c498fe2082222a1740d788e022e660c135564b3fd299cab5425"},
@@ -270,7 +270,7 @@
 {"name":"grape","version":"2.0.0","platform":"ruby","checksum":"3aeff94c17e84ccead4ff98833df691e7da0c108878cc128ca31f80c1047494a"},
 {"name":"grape-entity","version":"0.10.2","platform":"ruby","checksum":"9eb584548135419d1c8ada7d21f7c174a7644e56a8b8e5bfc65d1a7a3421b571"},
 {"name":"grape-path-helpers","version":"2.0.1","platform":"ruby","checksum":"ad5216e52c6e796738a9118087352ab4c962900dbad1d8f8c0f96e093c6702d7"},
-{"name":"grape-swagger","version":"2.0.1","platform":"ruby","checksum":"0f90bede86dfe0f5317ea52fe9bfa93e595020e848cb46f1f8c47be04cb4c790"},
+{"name":"grape-swagger","version":"2.0.2","platform":"ruby","checksum":"a7139a56ba36fab2e8465f10d668a8c73c30cf44ebe8af960f5a4e3beb200805"},
 {"name":"grape-swagger-entity","version":"0.5.1","platform":"ruby","checksum":"f51e372d00ac96cf90d948f87b3f4eb287ab053976ca57ad503d442ad8605523"},
 {"name":"grape_logging","version":"1.8.4","platform":"ruby","checksum":"efcc3e322dbd5d620a68f078733b7db043cf12680144cd03c982f14115c792d1"},
 {"name":"graphiql-rails","version":"1.8.0","platform":"ruby","checksum":"02e2c5098be2c6c29219a0e9b2910a2cd3c494301587a3199a7c4484d8038ed1"},

Gemfile.lock

@@ -741,7 +741,7 @@ GEM
       omniauth (>= 1.3, < 3)
       pyu-ruby-sasl (>= 0.0.3.3, < 0.1)
       rubyntlm (~> 0.5)
-    gitlab_quality-test_tooling (1.21.0)
+    gitlab_quality-test_tooling (1.21.1)
       activesupport (>= 6.1, < 7.2)
       amatch (~> 0.4.1)
       gitlab (~> 4.19)
@@ -858,7 +858,7 @@ GEM
       grape (~> 2.0)
       rake (> 12)
       ruby2_keywords (~> 0.0.2)
-    grape-swagger (2.0.1)
+    grape-swagger (2.0.2)
       grape (>= 1.7, < 3.0)
       rack-test (~> 2)
     grape-swagger-entity (0.5.1)
@@ -1929,7 +1929,7 @@ DEPENDENCIES
   gitlab-utils!
   gitlab_chronic_duration (~> 0.12)
   gitlab_omniauth-ldap (~> 2.2.0)
-  gitlab_quality-test_tooling (~> 1.21.0)
+  gitlab_quality-test_tooling (~> 1.21.1)
   gon (~> 6.4.0)
   google-apis-androidpublisher_v3 (~> 0.34.0)
   google-apis-cloudbilling_v1 (~> 0.21.0)
@@ -1951,7 +1951,7 @@ DEPENDENCIES
   grape (~> 2.0.0)
   grape-entity (~> 0.10.2)
   grape-path-helpers (~> 2.0.1)
-  grape-swagger (~> 2.0.1)
+  grape-swagger (~> 2.0.2)
   grape-swagger-entity (~> 0.5.1)
   grape_logging (~> 1.8, >= 1.8.4)
   graphiql-rails (~> 1.8.0)

app/assets/javascripts/ci/pipeline_details/graph/graph_component_wrapper.vue

@@ -106,7 +106,7 @@ export default {
     },
     headerPipeline: {
       query: getPipelineQuery,
-      // this query is already being called in pipeline_details_header.vue, which shares the same cache as this component
+      // this query is already being called in pipeline_header.vue, which shares the same cache as this component
       // the skip here is to prevent sending double network requests on page load
       skip() {
         return !this.canRefetchHeaderPipeline;

app/assets/javascripts/ci/pipeline_details/header/pipeline_details_header.vue → app/assets/javascripts/ci/pipeline_details/header/pipeline_header.vue

@@ -20,7 +20,7 @@ import getPipelineQuery from './graphql/queries/get_pipeline_header_data.query.g
 import { POLL_INTERVAL } from './constants';
 
 export default {
-  name: 'PipelineDetailsHeader',
+  name: 'PipelineHeader',
   BUTTON_TOOLTIP_RETRY,
   BUTTON_TOOLTIP_CANCEL,
   pipelineCancel: 'pipelineCancel',
@@ -292,7 +292,7 @@ export default {
 </script>
 
 <template>
-  <div class="gl-my-4" data-testid="pipeline-details-header">
+  <div class="gl-my-4" data-testid="pipeline-header">
     <gl-alert
       v-if="hasError"
       class="gl-mb-4"

app/assets/javascripts/ci/pipeline_details/pipeline_details_bundle.js

@@ -2,18 +2,18 @@ import VueRouter from 'vue-router';
 import { createAlert } from '~/alert';
 import { __ } from '~/locale';
 import { pipelineTabName } from './constants';
-import { createPipelineDetailsHeaderApp } from './pipeline_details_header';
+import { createPipelineHeaderApp } from './pipeline_header';
 import { apolloProvider } from './pipeline_shared_client';
 
 const SELECTORS = {
-  PIPELINE_DETAILS_HEADER: '#js-pipeline-details-header-vue',
+  PIPELINE_HEADER: '#js-pipeline-header-vue',
   PIPELINE_TABS: '#js-pipeline-tabs',
 };
 
 export default async function initPipelineDetailsBundle() {
-  const headerSelector = SELECTORS.PIPELINE_DETAILS_HEADER;
+  const headerSelector = SELECTORS.PIPELINE_HEADER;
 
-  const headerApp = createPipelineDetailsHeaderApp;
+  const headerApp = createPipelineHeaderApp;
 
   const headerEl = document.querySelector(headerSelector);
 

app/assets/javascripts/ci/pipeline_details/pipeline_details_header.js → app/assets/javascripts/ci/pipeline_details/pipeline_header.js

 import Vue from 'vue';
 import VueApollo from 'vue-apollo';
-import PipelineDetailsHeader from './header/pipeline_details_header.vue';
+import PipelineHeader from './header/pipeline_header.vue';
 
 Vue.use(VueApollo);
 
-export const createPipelineDetailsHeaderApp = (elSelector, apolloProvider, graphqlResourceEtag) => {
+export const createPipelineHeaderApp = (elSelector, apolloProvider, graphqlResourceEtag) => {
   const el = document.querySelector(elSelector);
 
   if (!el) {
@@ -16,7 +16,7 @@ export const createPipelineDetailsHeaderApp = (elSelector, apolloProvider, graph
   // eslint-disable-next-line no-new
   new Vue({
     el,
-    name: 'PipelineDetailsHeaderApp',
+    name: 'PipelineHeaderApp',
     apolloProvider,
     provide: {
       paths: {
@@ -27,7 +27,7 @@ export const createPipelineDetailsHeaderApp = (elSelector, apolloProvider, graph
       pipelineIid,
     },
     render(createElement) {
-      return createElement(PipelineDetailsHeader);
+      return createElement(PipelineHeader);
     },
   });
 };