Add latest changes from gitlab-org/gitlab@master

5 files changed, 11 insertions, 3 deletions

diff --git a/.gitlab/ci/frontend.gitlab-ci.yml b/.gitlab/ci/frontend.gitlab-ci.yml
index f72396e4edf..2f53c6e3fcf 100644
--- a/.gitlab/ci/frontend.gitlab-ci.yml
+++ b/.gitlab/ci/frontend.gitlab-ci.yml
@@ -230,6 +230,7 @@ webpack-dev-server:
     - .default-tags
     - .default-retry
     - .default-cache
+    - .default-only
     - .only-code-changes
   dependencies: ["setup-test-env", "compile-assets", "compile-assets pull-cache"]
   variables:
diff --git a/.gitlab/ci/pages.gitlab-ci.yml b/.gitlab/ci/pages.gitlab-ci.yml
index 47f4117e34a..a59b84fe1cf 100644
--- a/.gitlab/ci/pages.gitlab-ci.yml
+++ b/.gitlab/ci/pages.gitlab-ci.yml
@@ -4,6 +4,7 @@ pages:
     - .default-retry
     - .default-cache
     - .default-only
+    - .only-code-qa-changes
   only:
     refs:
       - master
diff --git a/.gitlab/ci/qa.gitlab-ci.yml b/.gitlab/ci/qa.gitlab-ci.yml
index e7362f913a9..013af3d61a4 100644
--- a/.gitlab/ci/qa.gitlab-ci.yml
+++ b/.gitlab/ci/qa.gitlab-ci.yml
@@ -25,7 +25,9 @@ package-and-qa-manual:
   needs: ["build-qa-image", "gitlab:assets:compile pull-cache"]
 
 package-and-qa-manual:master:
-  extends: .package-and-qa-base
+  extends:
+    - .package-and-qa-base
+    - .only-code-qa-changes
   only:
     refs:
       - master@gitlab-org/gitlab-foss
diff --git a/.gitlab/ci/setup.gitlab-ci.yml b/.gitlab/ci/setup.gitlab-ci.yml
index e673eb9c7f3..129913a9f2d 100644
--- a/.gitlab/ci/setup.gitlab-ci.yml
+++ b/.gitlab/ci/setup.gitlab-ci.yml
@@ -6,6 +6,7 @@ cache gems:
     - .default-retry
     - .default-cache
     - .default-before_script
+    - .only-code-qa-changes
   stage: test
   dependencies: ["setup-test-env"]
   needs: ["setup-test-env"]
diff --git a/.gitlab/ci/test-metadata.gitlab-ci.yml b/.gitlab/ci/test-metadata.gitlab-ci.yml
index fe3cde2bb16..5e2523e8a9c 100644
--- a/.gitlab/ci/test-metadata.gitlab-ci.yml
+++ b/.gitlab/ci/test-metadata.gitlab-ci.yml
@@ -1,5 +1,6 @@
 .tests-metadata-state:
-  extends: .default-only
+  extends:
+    - .default-only
   variables:
     TESTS_METADATA_S3_BUCKET: "gitlab-ce-cache"
   before_script:
@@ -31,7 +32,9 @@ retrieve-tests-metadata:
     - '[[ ! -d "ee/" ]] || [[ -f $EE_KNAPSACK_RSPEC_SUITE_REPORT_PATH ]] || echo "{}" > ${EE_KNAPSACK_RSPEC_SUITE_REPORT_PATH}'
 
 update-tests-metadata:
-  extends: .tests-metadata-state
+  extends:
+    - .tests-metadata-state
+    - .only-code-changes
   stage: post-test
   cache:
     key: tests_metadata