Add latest changes from gitlab-org/gitlab@master

1 files changed, 34 insertions, 11 deletions

diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml
index 3702bec199e..8d0349fa117 100644
--- a/.gitlab/ci/rules.gitlab-ci.yml
+++ b/.gitlab/ci/rules.gitlab-ci.yml
@@ -264,7 +264,7 @@
   - "Dockerfile.assets"
   - "config/**/*.js"
   - "vendor/assets/**/*"
-  - "{app/assets,app/helpers,app/presenters,app/views,locale,public,spec/frontend,symbol}/**/*"
+  - "{app/assets,app/components,app/helpers,app/presenters,app/views,locale,public,spec/frontend,symbol}/**/*"
 
 .controllers-patterns: &controllers-patterns
   - "{,ee/,jh/}{app/controllers}/**/*"
@@ -284,7 +284,7 @@
   - "Rakefile"
   - "config.ru"
   # List explicitly all the app/ dirs that are backend (i.e. all except app/assets).
-  - "{,ee/,jh/}{app/channels,app/controllers,app/finders,app/graphql,app/helpers,app/mailers,app/models,app/policies,app/presenters,app/serializers,app/services,app/uploaders,app/validators,app/views,app/workers}/**/*"
+  - "{,ee/,jh/}{app/channels,app/components,app/controllers,app/finders,app/graphql,app/helpers,app/mailers,app/models,app/policies,app/presenters,app/serializers,app/services,app/uploaders,app/validators,app/views,app/workers}/**/*"
   - "{,ee/,jh/}{bin,config,db,generator_templates,lib}/**/*"
   - "{,ee/,jh/}spec/**/*"
   # CI changes
@@ -299,7 +299,7 @@
   - "{,jh/}Gemfile.lock"
   - "GITLAB_ELASTICSEARCH_INDEXER_VERSION"
   # List explicitly all the app/ dirs that are backend (i.e. all except app/assets).
-  - "{,ee/,jh/}{app/channels,app/controllers,app/finders,app/graphql,app/helpers,app/mailers,app/models,app/policies,app/presenters,app/serializers,app/services,app/uploaders,app/validators,app/views,app/workers}/**/*"
+  - "{,ee/,jh/}{app/channels,app/components,app/controllers,app/finders,app/graphql,app/helpers,app/mailers,app/models,app/policies,app/presenters,app/serializers,app/services,app/uploaders,app/validators,app/views,app/workers}/**/*"
   - "{,ee/,jh/}{bin,config,db,generator_templates,lib}/**/*"
   - "{,ee/,jh/}spec/**/*"
 
@@ -494,9 +494,14 @@
 
 .static-analysis-patterns: &static-analysis-patterns
   - ".{codeclimate,eslintrc,haml-lint,haml-lint_todo}.yml"
-  - ".rubocop.yml"
-  - ".rubocop_todo.yml"
+
+.rubocop-patterns: &rubocop-patterns
+  - ".{rubocop,rubocop_todo}.yml"
   - ".rubocop_todo/**/*.yml"
+  - "{,ee/,jh/}rubocop/**/*"  # We might be changing custom cops
+  - "{,ee/,jh/}Gemfile.lock"  # This should include gitlab-styles, rubocop itself, and any plugins we might be using
+  - "lib/gitlab_edition.rb"  # This is required in RuboCop::CodeReuseHelpers
+  - ".gitlab/ci/static-analysis.gitlab-ci.yml"
 
 .danger-patterns: &danger-patterns
   - "Dangerfile"
@@ -1427,24 +1432,42 @@
 # Static analysis rules #
 #########################
 
-.static-analysis:rules:ee-and-foss:
+.static-analysis:rules:static-analysis:
   rules:
     - changes: *code-backstage-qa-patterns
     - changes: *static-analysis-patterns
 
-.static-analysis:rules:ee-and-foss-qa:
+.static-analysis:rules:static-verification-with-database:
+  rules:
+    - changes: *code-backstage-qa-patterns
+
+.static-analysis:rules:rubocop:
+  rules:
+    - changes: *rubocop-patterns
+      variables:
+        RUN_ALL_RUBOCOP: "true"
+    - changes: *code-backstage-qa-patterns
+
+.static-analysis:rules:qa:metadata-lint:
   rules:
     - changes: *qa-patterns
+    - changes: [".gitlab/ci/static-analysis.gitlab-ci.yml"]
+
+.static-analysis:rules:haml-lint:
+  rules:
+    - changes: *rubocop-patterns
     - changes: *static-analysis-patterns
+    - changes: *code-backstage-qa-patterns
 
-.static-analysis:rules:ee:
+.static-analysis:rules:haml-lint-ee:
   rules:
     - <<: *if-not-ee
       when: never
-    - changes: *code-backstage-qa-patterns
+    - changes: *rubocop-patterns
     - changes: *static-analysis-patterns
+    - changes: *code-backstage-qa-patterns
 
-.static-analysis:rules:as-if-foss:
+.static-analysis:rules:static-analysis-as-if-foss:
   rules:
     - <<: *if-not-ee
       when: never
@@ -1453,7 +1476,7 @@
     - <<: *if-security-merge-request
       changes: *code-backstage-qa-patterns
     - <<: *if-merge-request
-      changes: *ci-patterns
+      changes: [".gitlab/ci/static-analysis.gitlab-ci.yml"]
     - <<: *if-merge-request
       changes: *static-analysis-patterns