Add latest changes from gitlab-org/gitlab@master

.gitlab/ci/review-apps/qa.gitlab-ci.yml

@@ -58,7 +58,7 @@ include:
 download-knapsack-report:
   extends:
     - .bundle-base
-    - .review:rules:review-build-cng
+    - .rules:app-or-qa-framework-changes-or-review-scenarios
   stage: prepare
   script:
     - bundle exec rake "knapsack:download[qa]"
@@ -134,7 +134,7 @@ review-performance:
 e2e-test-report:
   extends:
     - .generate-allure-report-base
-    - .rules:qa-framework-changes-or-review-scenarios
+    - .rules:app-or-qa-framework-changes-or-review-scenarios
   stage: post-qa
   variables:
     ALLURE_JOB_NAME: e2e-review-qa
@@ -162,7 +162,7 @@ upload-knapsack-report:
 delete-test-resources:
   extends:
     - .bundle-base
-    - .rules:qa-framework-changes-or-review-scenarios
+    - .rules:app-or-qa-framework-changes-or-review-scenarios
   stage: post-qa
   variables:
     QA_TEST_RESOURCES_FILE_PATTERN: $CI_PROJECT_DIR/qa/tmp/test-resources-*.json

.gitlab/ci/review-apps/rules.gitlab-ci.yml

@@ -70,10 +70,11 @@
 # ------------------------------------------
 # Prepare/Report
 # ------------------------------------------
-# if no framework changes or QA_SUITES do not contain review scenarios, pipeline will not have e2e test jobs
+# if no rules for test execution are matched, pipeline will not have e2e test jobs
 # so we need to skip knapsack, allure and test resource deletion jobs as well
-.rules:qa-framework-changes-or-review-scenarios:
+.rules:app-or-qa-framework-changes-or-review-scenarios:
   rules:
+    - *app-changes
     - *qa-framework-changes
     - if: $QA_SUITES =~ /Test::Instance::Smoke/
     - if: $QA_SUITES =~ /Test::Instance::ReviewBlocking/

Gemfile.lock

@@ -1020,7 +1020,7 @@ GEM
     peek (1.1.0)
       railties (>= 4.0.0)
     pg (1.4.1)
-    pg_query (2.1.3)
+    pg_query (2.1.4)
       google-protobuf (>= 3.19.2)
     plist (3.6.0)
     png_quantizator (0.2.1)

db/post_migrate/20220726225114_remove_tmp_index_group_membership_namespace_id_column.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class RemoveTmpIndexGroupMembershipNamespaceIdColumn < Gitlab::Database::Migration[2.0]
+  INDEX_NAME = 'tmp_index_for_namespace_id_migration_on_group_members'
+
+  disable_ddl_transaction!
+
+  def up
+    remove_concurrent_index_by_name :members, INDEX_NAME
+  end
+
+  def down
+    add_concurrent_index :members, :id,
+    where: "members.member_namespace_id IS NULL and members.type = 'GroupMember'",
+    name: INDEX_NAME
+  end
+end

db/schema_migrations/20220726225114

@@ -0,0 +1 @@
+24e39665566d86ddca2bfc134fd37e11840edc9bc34add077e39fa7e5b8272d5

db/structure.sql

@@ -30876,8 +30876,6 @@ CREATE INDEX tmp_index_container_repos_on_non_migrated ON container_repositories
 
 CREATE INDEX tmp_index_container_repositories_on_id_migration_state ON container_repositories USING btree (id, migration_state);
 
-CREATE INDEX tmp_index_for_namespace_id_migration_on_group_members ON members USING btree (id) WHERE ((member_namespace_id IS NULL) AND ((type)::text = 'GroupMember'::text));
-
 CREATE INDEX tmp_index_for_null_project_namespace_id ON projects USING btree (id) WHERE (project_namespace_id IS NULL);
 
 CREATE INDEX tmp_index_for_project_namespace_id_migration_on_routes ON routes USING btree (id) WHERE ((namespace_id IS NULL) AND ((source_type)::text = 'Project'::text));

doc/user/application_security/sast/index.md

@@ -748,7 +748,7 @@ variables:
 
 ### Pipeline errors related to changes in the GitLab-managed CI/CD template
 
-The [the GitLab-managed SAST CI/CD template](#configure-sast-manually) controls which [analyzer](analyzers.md) jobs run and how they're configured. While using the template, you might experience a job failure or other pipeline error. For example, you might:
+The [GitLab-managed SAST CI/CD template](#configure-sast-manually) controls which [analyzer](analyzers.md) jobs run and how they're configured. While using the template, you might experience a job failure or other pipeline error. For example, you might:
 
 - See an error message like `'<your job>' needs 'spotbugs-sast' job, but 'spotbugs-sast' is not in any previous stage` when you view an affected pipeline.
 - Experience another type of unexpected issue with your CI/CD pipeline configuration.