Add latest changes from gitlab-org/gitlab@master

11 files changed, 114 insertions, 52 deletions

diff --git a/.gitlab/ci/docs.gitlab-ci.yml b/.gitlab/ci/docs.gitlab-ci.yml
index 14eeebb9db9..a43be817ce2 100644
--- a/.gitlab/ci/docs.gitlab-ci.yml
+++ b/.gitlab/ci/docs.gitlab-ci.yml
@@ -2,7 +2,7 @@
   extends:
     - .default-tags
     - .default-retry
-    - .only-docs-changes
+    - .only:changes-docs
   only:
     refs:
       - merge_requests
@@ -50,7 +50,7 @@ docs lint:
     - .default-tags
     - .default-retry
     - .default-only
-    - .only-docs-changes
+    - .only:changes-docs
   image: "registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-docs-lint"
   stage: test
   dependencies: []
@@ -76,7 +76,7 @@ graphql-docs-verify:
     - .default-cache
     - .default-only
     - .default-before_script
-    - .only-graphql-changes
+    - .only:changes-graphql
   variables:
     SETUP_DB: "false"
   stage: test
diff --git a/.gitlab/ci/frontend.gitlab-ci.yml b/.gitlab/ci/frontend.gitlab-ci.yml
index 2f457bc0ee2..0b72461a9fd 100644
--- a/.gitlab/ci/frontend.gitlab-ci.yml
+++ b/.gitlab/ci/frontend.gitlab-ci.yml
@@ -12,7 +12,7 @@
     - .default-only
     - .default-before_script
     - .assets-compile-cache
-    - .only-code-qa-changes
+    - .only:changes-code-backstage-qa
   image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.3-git-2.22-chrome-73.0-node-12.x-yarn-1.16-graphicsmagick-1.3.33-docker-18.06.1
   stage: test
   dependencies: ["setup-test-env"]
@@ -73,7 +73,7 @@ gitlab:assets:compile pull-cache:
     - .default-only
     - .default-before_script
     - .assets-compile-cache
-    - .only-code-qa-changes
+    - .only:changes-code-backstage-qa
     - .use-pg9
   stage: prepare
   script:
@@ -128,7 +128,7 @@ compile-assets pull-cache foss:
     - .default-cache
     - .default-only
     - .default-before_script
-    - .only-code-changes
+    - .only:changes-code-backstage
     - .use-pg9
   stage: test
   needs: ["setup-test-env", "compile-assets pull-cache"]
@@ -205,7 +205,7 @@ jest-foss:
     - .default-retry
     - .default-cache
     - .default-only
-    - .only-code-changes
+    - .only:changes-code-backstage
   stage: test
   dependencies: []
   cache:
@@ -238,7 +238,7 @@ webpack-dev-server:
     - .default-retry
     - .default-cache
     - .default-only
-    - .only-code-changes
+    - .only:changes-code-backstage
   stage: test
   needs: ["setup-test-env", "compile-assets pull-cache"]
   dependencies: ["setup-test-env", "compile-assets pull-cache"]
diff --git a/.gitlab/ci/global.gitlab-ci.yml b/.gitlab/ci/global.gitlab-ci.yml
index fc9b00b5d3c..743f4ec3390 100644
--- a/.gitlab/ci/global.gitlab-ci.yml
+++ b/.gitlab/ci/global.gitlab-ci.yml
@@ -40,14 +40,64 @@
       - merge_requests
       - tags
 
-.only-code-changes:
+.code-patterns: &code-patterns
+  - ".gitlab/ci/**/*"
+  - ".{eslintignore,gitattributes,nvmrc,prettierrc,stylelintrc,yamllint}"
+  - ".{codeclimate,eslintrc,gitlab-ci,haml-lint,haml-lint_todo,rubocop,rubocop_todo,scss-lint}.yml"
+  - ".csscomb.json"
+  - "Dockerfile.assets"
+  - "*_VERSION"
+  - "Gemfile{,.lock}"
+  - "Rakefile"
+  - "{babel.config,jest.config}.js"
+  - "config.ru"
+  - "{package.json,yarn.lock}"
+  - "{,ee/}{app,bin,config,db,haml_lint,lib,locale,public,scripts,symbol,vendor}/**/*"
+
+.backstage-patterns: &backstage-patterns
+  - "Dangerfile"
+  - "danger/**/*"
+  - "{,ee/}fixtures/**/*"
+  - "{,ee/}rubocop/**/*"
+  - "{,ee/}spec/**/*"
+  - "doc/README.md"  # Some RSpec test rely on this file
+
+.qa-patterns: &qa-patterns
+  - ".dockerignore"
+  - "qa/**/*"
+
+.docs-patterns: &docs-patterns
+  - ".gitlab/route-map.yml"
+  - "doc/**/*"
+  - ".markdownlint.json"
+
+.graphql-patterns: &graphql-patterns
+  - "{,ee/}app/graphql/**/*"
+  - "{,ee/}lib/gitlab/graphql/**/*"
+
+.only:changes-code:
+  only:
+    changes: *code-patterns
+
+.only:changes-qa:
+  only:
+    changes: *qa-patterns
+
+.only:changes-docs:
+  only:
+    changes: *docs-patterns
+
+.only:changes-graphql:
+  only:
+    changes: *graphql-patterns
+
+.only:changes-code-backstage:
   only:
     changes:
       - ".gitlab/ci/**/*"
       - ".{eslintignore,gitattributes,nvmrc,prettierrc,stylelintrc,yamllint}"
       - ".{codeclimate,eslintrc,gitlab-ci,haml-lint,haml-lint_todo,rubocop,rubocop_todo,scss-lint}.yml"
       - ".csscomb.json"
-      - "Dangerfile"
       - "Dockerfile.assets"
       - "*_VERSION"
       - "Gemfile{,.lock}"
@@ -55,36 +105,41 @@
       - "{babel.config,jest.config}.js"
       - "config.ru"
       - "{package.json,yarn.lock}"
-      - "{app,bin,config,danger,db,ee,fixtures,haml_lint,lib,locale,public,rubocop,scripts,spec,symbol,vendor}/**/*"
+      - "{,ee/}{app,bin,config,db,haml_lint,lib,locale,public,scripts,symbol,vendor}/**/*"
+      # Backstage changes
+      - "Dangerfile"
+      - "danger/**/*"
+      - "{,ee/}fixtures/**/*"
+      - "{,ee/}rubocop/**/*"
+      - "{,ee/}spec/**/*"
       - "doc/README.md"  # Some RSpec test rely on this file
 
-.only-qa-changes:
+.only:changes-code-qa:
   only:
     changes:
+      - ".gitlab/ci/**/*"
+      - ".{eslintignore,gitattributes,nvmrc,prettierrc,stylelintrc,yamllint}"
+      - ".{codeclimate,eslintrc,gitlab-ci,haml-lint,haml-lint_todo,rubocop,rubocop_todo,scss-lint}.yml"
+      - ".csscomb.json"
+      - "Dockerfile.assets"
+      - "*_VERSION"
+      - "Gemfile{,.lock}"
+      - "Rakefile"
+      - "{babel.config,jest.config}.js"
+      - "config.ru"
+      - "{package.json,yarn.lock}"
+      - "{,ee/}{app,bin,config,db,haml_lint,lib,locale,public,scripts,symbol,vendor}/**/*"
+      # QA changes
       - ".dockerignore"
       - "qa/**/*"
 
-.only-docs-changes:
-  only:
-    changes:
-      - ".gitlab/route-map.yml"
-      - "doc/**/*"
-      - ".markdownlint.json"
-
-.only-graphql-changes:
-  only:
-    changes:
-      - "{,ee/}app/graphql/**/*"
-      - "{,ee/}lib/gitlab/graphql/**/*"
-
-.only-code-qa-changes:
+.only:changes-code-backstage-qa:
   only:
     changes:
       - ".gitlab/ci/**/*"
       - ".{eslintignore,gitattributes,nvmrc,prettierrc,stylelintrc,yamllint}"
       - ".{codeclimate,eslintrc,gitlab-ci,haml-lint,haml-lint_todo,rubocop,rubocop_todo,scss-lint}.yml"
       - ".csscomb.json"
-      - "Dangerfile"
       - "Dockerfile.assets"
       - "*_VERSION"
       - "Gemfile{,.lock}"
@@ -92,8 +147,15 @@
       - "{babel.config,jest.config}.js"
       - "config.ru"
       - "{package.json,yarn.lock}"
-      - "{app,bin,config,danger,db,ee,fixtures,haml_lint,lib,locale,public,rubocop,scripts,spec,symbol,vendor}/**/*"
+      - "{,ee/}{app,bin,config,db,haml_lint,lib,locale,public,scripts,symbol,vendor}/**/*"
+      # Backstage changes
+      - "Dangerfile"
+      - "danger/**/*"
+      - "{,ee/}fixtures/**/*"
+      - "{,ee/}rubocop/**/*"
+      - "{,ee/}spec/**/*"
       - "doc/README.md"  # Some RSpec test rely on this file
+      # QA changes
       - ".dockerignore"
       - "qa/**/*"
 
diff --git a/.gitlab/ci/memory.gitlab-ci.yml b/.gitlab/ci/memory.gitlab-ci.yml
index 93bf87b24b2..ba14024df34 100644
--- a/.gitlab/ci/memory.gitlab-ci.yml
+++ b/.gitlab/ci/memory.gitlab-ci.yml
@@ -5,7 +5,7 @@
     - .default-cache
     - .default-only
     - .default-before_script
-    - .only-code-changes
+    - .only:changes-code
 
 memory-static:
   extends: .only-code-memory-job-base
diff --git a/.gitlab/ci/pages.gitlab-ci.yml b/.gitlab/ci/pages.gitlab-ci.yml
index a30772d5664..a9099d140ff 100644
--- a/.gitlab/ci/pages.gitlab-ci.yml
+++ b/.gitlab/ci/pages.gitlab-ci.yml
@@ -4,7 +4,7 @@ pages:
     - .default-retry
     - .default-cache
     - .default-only
-    - .only-code-qa-changes
+    - .only:changes-code-backstage-qa
   only:
     refs:
       - master
diff --git a/.gitlab/ci/qa.gitlab-ci.yml b/.gitlab/ci/qa.gitlab-ci.yml
index 1194948a76f..ef407081d50 100644
--- a/.gitlab/ci/qa.gitlab-ci.yml
+++ b/.gitlab/ci/qa.gitlab-ci.yml
@@ -3,7 +3,7 @@
     - .default-tags
     - .default-retry
     - .default-only
-    - .only-code-qa-changes
+    - .only:changes-code-qa
   stage: test
   dependencies: []
   cache:
@@ -47,7 +47,7 @@ qa:selectors-foss:
 package-and-qa-manual:
   extends:
     - .package-and-qa-base
-    - .only-code-changes
+    - .only:changes-code
   except:
     refs:
       - master
@@ -58,7 +58,7 @@ package-and-qa-manual:
 package-and-qa:
   extends:
     - .package-and-qa-base
-    - .only-qa-changes
+    - .only:changes-qa
   except:
     refs:
       - master
@@ -69,6 +69,6 @@ package-and-qa:
 schedule:package-and-qa:
   extends:
     - .package-and-qa-base
-    - .only-code-qa-changes
+    - .only:changes-code-qa
     - .only-canonical-schedules
   needs: ["build-qa-image", "gitlab:assets:compile pull-cache"]
diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml
index bf478b68765..32cada6ea40 100644
--- a/.gitlab/ci/rails.gitlab-ci.yml
+++ b/.gitlab/ci/rails.gitlab-ci.yml
@@ -22,7 +22,7 @@
     - .default-cache
     - .default-only
     - .default-before_script
-    - .only-code-changes
+    - .only:changes-code-backstage
 
 .only-code-qa-rails-job-base:
   extends:
@@ -31,7 +31,7 @@
     - .default-cache
     - .default-only
     - .default-before_script
-    - .only-code-qa-changes
+    - .only:changes-code-backstage-qa
 
 setup-test-env:
   extends:
@@ -251,7 +251,7 @@ static-analysis:
 downtime_check:
   extends:
     - .rake-exec
-    - .only-code-changes
+    - .only:changes-code-backstage
   except:
     refs:
       - master
diff --git a/.gitlab/ci/reports.gitlab-ci.yml b/.gitlab/ci/reports.gitlab-ci.yml
index 16c3f0e4f8c..fbb7826b6f2 100644
--- a/.gitlab/ci/reports.gitlab-ci.yml
+++ b/.gitlab/ci/reports.gitlab-ci.yml
@@ -11,7 +11,7 @@ code_quality:
   extends:
     - .default-retry
     - .default-only
-    - .only-code-changes
+    - .only:changes-code-backstage
   stage: test
   image: docker:stable
   allow_failure: true
@@ -50,7 +50,7 @@ sast:
   extends:
     - .default-retry
     - .default-only
-    - .only-code-changes
+    - .only:changes-code-backstage-qa
   stage: test
   image: docker:stable
   variables:
@@ -132,7 +132,7 @@ dependency_scanning:
   extends:
     - .default-retry
     - .default-only
-    - .only-code-changes
+    - .only:changes-code-backstage-qa
   stage: test
   image: docker:stable
   variables:
@@ -195,7 +195,7 @@ dast:
   extends:
     - .default-retry
     - .default-only
-    - .only-code-qa-changes
+    - .only:changes-code-qa
     - .only-review
   stage: qa
   needs: ["review-deploy"]
diff --git a/.gitlab/ci/review.gitlab-ci.yml b/.gitlab/ci/review.gitlab-ci.yml
index a71c4ea2f1d..539ae8a2512 100644
--- a/.gitlab/ci/review.gitlab-ci.yml
+++ b/.gitlab/ci/review.gitlab-ci.yml
@@ -23,7 +23,7 @@
 build-qa-image:
   extends:
     - .review-docker
-    - .only-code-qa-changes
+    - .only:changes-code-qa
   only:
     variables:
       - $CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_NAMESPACE == "gitlab-org"
@@ -40,7 +40,7 @@ build-qa-image:
     - .default-tags
     - .default-retry
     - .default-only
-    - .only-code-qa-changes
+    - .only:changes-code-qa
   stage: prepare
   image: registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-charts-build-base
   allow_failure: true
@@ -66,7 +66,7 @@ manual:review-cleanup:
 .review-build-cng-base:
   extends:
     - .default-only
-    - .only-code-qa-changes
+    - .only:changes-code-qa
     - .except-deploys
   image: ruby:2.6-alpine
   stage: review-prepare
@@ -95,7 +95,7 @@ schedule:review-build-cng:
     - .default-tags
     - .default-retry
     - .default-only
-    - .only-code-qa-changes
+    - .only:changes-code-qa
     - .except-deploys
   stage: review
   image: registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-charts-build-base
@@ -189,7 +189,7 @@ review-cleanup-failed-deployment:
   extends:
     - .review-docker
     - .only-review
-    - .only-code-qa-changes
+    - .only:changes-code-qa
   stage: qa
   allow_failure: true
   variables:
@@ -236,7 +236,7 @@ review-qa-all:
 .review-performance-base:
   extends:
     - .review-docker
-    - .only-code-qa-changes
+    - .only:changes-code-qa
   stage: qa
   allow_failure: true
   before_script:
@@ -288,7 +288,7 @@ parallel-spec-reports:
   extends:
     - .default-tags
     - .default-only
-    - .only-code-qa-changes
+    - .only:changes-code-qa
     - .only-review
     - .except-deploys
   image: ruby:2.6-alpine
diff --git a/.gitlab/ci/setup.gitlab-ci.yml b/.gitlab/ci/setup.gitlab-ci.yml
index 861f3f1af5b..605f431b5ff 100644
--- a/.gitlab/ci/setup.gitlab-ci.yml
+++ b/.gitlab/ci/setup.gitlab-ci.yml
@@ -6,7 +6,7 @@ cache gems:
     - .default-retry
     - .default-cache
     - .default-before_script
-    - .only-code-qa-changes
+    - .only:changes-code-backstage-qa
   stage: test
   dependencies: ["setup-test-env"]
   needs: ["setup-test-env"]
@@ -29,7 +29,7 @@ cache gems:
     - .default-tags
     - .default-retry
     - .default-only
-    - .only-code-changes
+    - .only:changes-code-backstage
   dependencies: []
 
 gitlab_git_test:
diff --git a/.gitlab/ci/test-metadata.gitlab-ci.yml b/.gitlab/ci/test-metadata.gitlab-ci.yml
index 6a7f3157d59..21af0d373bc 100644
--- a/.gitlab/ci/test-metadata.gitlab-ci.yml
+++ b/.gitlab/ci/test-metadata.gitlab-ci.yml
@@ -1,7 +1,7 @@
 .tests-metadata-state:
   extends:
     - .default-only
-    - .only-code-changes
+    - .only:changes-code-backstage
   variables:
     TESTS_METADATA_S3_BUCKET: "gitlab-ce-cache"
   before_script:
@@ -48,7 +48,7 @@ flaky-examples-check:
     - .default-tags
     - .default-retry
     - .default-only
-    - .only-code-changes
+    - .only:changes-code-backstage
   image: ruby:2.6-alpine
   stage: post-test
   variables: