Add latest changes from gitlab-org/gitlab@master

11 files changed, 0 insertions, 28 deletions

diff --git a/.gitlab/ci/dev-fixtures.gitlab-ci.yml b/.gitlab/ci/dev-fixtures.gitlab-ci.yml
index 32f8ff45b14..e77a75d2822 100644
--- a/.gitlab/ci/dev-fixtures.gitlab-ci.yml
+++ b/.gitlab/ci/dev-fixtures.gitlab-ci.yml
@@ -1,6 +1,5 @@
 .run-dev-fixtures:
   extends:
-    - .default-tags
     - .default-retry
     - .default-cache
     - .default-before_script
diff --git a/.gitlab/ci/docs.gitlab-ci.yml b/.gitlab/ci/docs.gitlab-ci.yml
index 5b1f375d30e..946db0c4be8 100644
--- a/.gitlab/ci/docs.gitlab-ci.yml
+++ b/.gitlab/ci/docs.gitlab-ci.yml
@@ -1,6 +1,5 @@
 .review-docs:
   extends:
-    - .default-tags
     - .default-retry
     - .docs:rules:review-docs
   allow_failure: true
@@ -42,7 +41,6 @@ review-docs-cleanup:
 
 docs lint:
   extends:
-    - .default-tags
     - .default-retry
     - .docs:rules:docs-lint
   image: "registry.gitlab.com/gitlab-org/gitlab-docs:lint"
@@ -64,7 +62,6 @@ docs lint:
 
 graphql-reference-verify:
   extends:
-    - .default-tags
     - .default-retry
     - .default-cache
     - .default-before_script
diff --git a/.gitlab/ci/frontend.gitlab-ci.yml b/.gitlab/ci/frontend.gitlab-ci.yml
index 3ce61ec6e54..8685ccc5432 100644
--- a/.gitlab/ci/frontend.gitlab-ci.yml
+++ b/.gitlab/ci/frontend.gitlab-ci.yml
@@ -10,7 +10,6 @@
 
 .gitlab:assets:compile-metadata:
   extends:
-    - .default-tags
     - .default-retry
     - .default-before_script
     - .assets-compile-cache
@@ -64,7 +63,6 @@ gitlab:assets:compile pull-cache:
 
 .compile-assets-metadata:
   extends:
-    - .default-tags
     - .default-retry
     - .default-before_script
     - .assets-compile-cache
@@ -122,7 +120,6 @@ compile-assets pull-cache as-if-foss:
 
 .frontend-fixtures-base:
   extends:
-    - .default-tags
     - .default-retry
     - .default-cache
     - .default-before_script
@@ -160,7 +157,6 @@ frontend-fixtures-as-if-foss:
 
 .frontend-job-base:
   extends:
-    - .default-tags
     - .default-retry
     - .default-cache
     - .default-before_script
@@ -242,7 +238,6 @@ jest-as-if-foss:
 
 coverage-frontend:
   extends:
-    - .default-tags
     - .default-retry
     - .frontend:rules:default-frontend-jobs
   needs: ["jest"]
@@ -262,7 +257,6 @@ coverage-frontend:
 
 .qa-frontend-node:
   extends:
-    - .default-tags
     - .default-retry
     - .default-cache
     - .frontend:rules:qa-frontend-node
@@ -290,7 +284,6 @@ qa-frontend-node:latest:
 
 webpack-dev-server:
   extends:
-    - .default-tags
     - .default-retry
     - .default-cache
     - .frontend:rules:default-frontend-jobs
diff --git a/.gitlab/ci/global.gitlab-ci.yml b/.gitlab/ci/global.gitlab-ci.yml
index bd2e49bde31..d5c89eacbb2 100644
--- a/.gitlab/ci/global.gitlab-ci.yml
+++ b/.gitlab/ci/global.gitlab-ci.yml
@@ -1,7 +1,3 @@
-.default-tags:
-  tags:
-    - gitlab-org
-
 .default-retry:
   retry:
     max: 2  # This is confusing but this means "3 runs at max".
diff --git a/.gitlab/ci/memory.gitlab-ci.yml b/.gitlab/ci/memory.gitlab-ci.yml
index a3ec5dfab9f..b2267b03c5f 100644
--- a/.gitlab/ci/memory.gitlab-ci.yml
+++ b/.gitlab/ci/memory.gitlab-ci.yml
@@ -1,6 +1,5 @@
 .only-code-memory-job-base:
   extends:
-    - .default-tags
     - .default-retry
     - .default-cache
     - .default-before_script
diff --git a/.gitlab/ci/pages.gitlab-ci.yml b/.gitlab/ci/pages.gitlab-ci.yml
index 7c6f25cfe6b..983f675d1d6 100644
--- a/.gitlab/ci/pages.gitlab-ci.yml
+++ b/.gitlab/ci/pages.gitlab-ci.yml
@@ -1,6 +1,5 @@
 pages:
   extends:
-    - .default-tags
     - .default-retry
     - .default-cache
     - .pages:rules
diff --git a/.gitlab/ci/qa.gitlab-ci.yml b/.gitlab/ci/qa.gitlab-ci.yml
index c25f30f39a8..b0713c0944a 100644
--- a/.gitlab/ci/qa.gitlab-ci.yml
+++ b/.gitlab/ci/qa.gitlab-ci.yml
@@ -1,6 +1,5 @@
 .qa-job-base:
   extends:
-    - .default-tags
     - .default-retry
   stage: test
   needs: []
diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml
index 2f014824c91..f9074adeaba 100644
--- a/.gitlab/ci/rails.gitlab-ci.yml
+++ b/.gitlab/ci/rails.gitlab-ci.yml
@@ -7,7 +7,6 @@
 
 .rails-job-base:
   extends:
-    - .default-tags
     - .default-retry
     - .default-cache
     - .default-before_script
diff --git a/.gitlab/ci/review.gitlab-ci.yml b/.gitlab/ci/review.gitlab-ci.yml
index c8d633bcdf3..14b1561ec1a 100644
--- a/.gitlab/ci/review.gitlab-ci.yml
+++ b/.gitlab/ci/review.gitlab-ci.yml
@@ -1,6 +1,5 @@
 .review-docker:
   extends:
-    - .default-tags
     - .default-retry
   image: registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-qa-alpine-ruby-2.6
   services:
@@ -29,7 +28,6 @@ build-qa-image:
 
 review-cleanup:
   extends:
-    - .default-tags
     - .default-retry
     - .review:rules:review-cleanup
   stage: prepare
@@ -46,7 +44,6 @@ review-cleanup:
 
 review-build-cng:
   extends:
-    - .default-tags
     - .default-retry
     - .review:rules:mr-and-schedule
   image: ruby:2.6-alpine
@@ -63,7 +60,6 @@ review-build-cng:
 
 .review-workflow-base:
   extends:
-    - .default-tags
     - .default-retry
   image: registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-charts-build-base
   variables:
@@ -217,7 +213,6 @@ review-performance:
 
 parallel-spec-reports:
   extends:
-    - .default-tags
     - .review:rules:mr-only-manual
   image: ruby:2.6-alpine
   stage: post-qa
@@ -244,7 +239,6 @@ parallel-spec-reports:
 
 danger-review:
   extends:
-    - .default-tags
     - .default-retry
     - .default-cache
     - .review:rules:danger
diff --git a/.gitlab/ci/setup.gitlab-ci.yml b/.gitlab/ci/setup.gitlab-ci.yml
index b4b911ab607..b1918961f3e 100644
--- a/.gitlab/ci/setup.gitlab-ci.yml
+++ b/.gitlab/ci/setup.gitlab-ci.yml
@@ -2,7 +2,6 @@
 # rubygems.org in the future.
 cache gems:
   extends:
-    - .default-tags
     - .default-retry
     - .default-cache
     - .default-before_script
@@ -21,7 +20,6 @@ cache gems:
 
 .minimal-job:
   extends:
-    - .default-tags
     - .default-retry
   needs: []
 
diff --git a/.gitlab/ci/yaml.gitlab-ci.yml b/.gitlab/ci/yaml.gitlab-ci.yml
index 6c0286ed18a..ab31dd59299 100644
--- a/.gitlab/ci/yaml.gitlab-ci.yml
+++ b/.gitlab/ci/yaml.gitlab-ci.yml
@@ -2,7 +2,6 @@
 # This uses rules from project root `.yamllint`.
 lint-ci-gitlab:
   extends:
-    - .default-tags
     - .default-retry
     - .yaml:rules
   image: sdesbure/yamllint:latest