Add latest changes from gitlab-org/gitlab@14-6-stable-eev14.6.0-rc42

1 files changed, 16 insertions, 18 deletions

diff --git a/.gitlab/CODEOWNERS b/.gitlab/CODEOWNERS
index c6a89ddfa9c..5eb96d1addd 100644
--- a/.gitlab/CODEOWNERS
+++ b/.gitlab/CODEOWNERS
@@ -11,22 +11,23 @@
 /doc/.markdownlint @marcel.amirault @eread @aqualls @cnorris
 /doc/ @gl-docsteam
 /doc/.vale/ @marcel.amirault @eread @aqualls @cnorris
-/doc/administration/geo/ @marcel.amirault
+/doc/administration/geo/ @axil
 /doc/administration/gitaly/ @eread
 /doc/administration/lfs/ @aqualls
 /doc/administration/monitoring/ @ngaskill
-/doc/administration/operations/ @marcel.amirault @eread @marcia
+/doc/administration/operations/ @axil @eread @marcia
 /doc/administration/packages/ @ngaskill
 /doc/administration/pages/ @rdickenson @kpaizee
 /doc/administration/postgresql/ @marcia
-/doc/administration/raketasks/ @marcel.amirault @eread
-/doc/administration/redis/ @marcel.amirault
-/doc/administration/reference_architectures/ @marcel.amirault
+/doc/administration/raketasks/ @axil @eread
+/doc/administration/redis/ @axil
+/doc/administration/reference_architectures/ @axil
 /doc/administration/snippets/ @aqualls
-/doc/administration/troubleshooting @marcel.amirault @marcia @eread
+/doc/administration/troubleshooting @axil @marcia @eread
 /doc/api/graphql/ @msedlakjakubowski @kpaizee
 /doc/api/graphql/reference/ @kpaizee
 /doc/api/group_activity_analytics.md @fneill
+/doc/api/vulnerabilities.md @fneill
 /doc/ci/ @marcel.amirault @sselhorn
 /doc/ci/environments/ @rdickenson
 /doc/ci/services/ @sselhorn
@@ -36,7 +37,7 @@
 /doc/development/i18n/ @ngaskill
 /doc/development/value_stream_analytics.md @fneill
 /doc/gitlab-basics/ @aqualls
-/doc/install/ @marcel.amirault
+/doc/install/ @axil
 /doc/operations/ @ngaskill @rdickenson
 /doc/push_rules/ @aqualls
 /doc/security/ @eread
@@ -44,11 +45,15 @@
 /doc/subscriptions/ @sselhorn
 /doc/topics/autodevops/ @marcia
 /doc/topics/git/ @aqualls
-/doc/update/ @marcel.amirault @marcia
+/doc/update/ @axil @marcia
 /doc/user/analytics/ @fneill @ngaskill
 /doc/user/application_security/ @rdickenson
 /doc/user/application_security/container_scanning/ @ngaskill
 /doc/user/application_security/cluster_image_scanning/ @ngaskill
+/doc/user/application_security/cve_id_request.md @fneill
+/doc/user/application_security/security_dashboard @fneill
+/doc/user/application_security/vulnerabilities @fneill
+/doc/user/application_security/vulnerability_report @fneill
 /doc/user/clusters/ @marcia
 /doc/user/compliance/ @rdickenson @eread
 /doc/user/group/ @msedlakjakubowski
@@ -80,7 +85,6 @@
 
 [Docs Create]
 /doc/administration/file_hooks.md @aqualls
-/doc/administration/git_annex.md @aqualls
 /doc/administration/git_protocol.md @aqualls
 /doc/administration/invalidate_markdown_cache.md @aqualls
 /doc/administration/issue_closing_pattern.md @aqualls
@@ -173,7 +177,6 @@
 /lib/gitlab/background_migration/ @gitlab-org/maintainers/database
 /ee/lib/ee/gitlab/background_migration/ @gitlab-org/maintainers/database
 /lib/gitlab/database/ @gitlab-org/maintainers/database
-/ee/lib/gitlab/database/ @gitlab-org/maintainers/database
 /lib/gitlab/sql/ @gitlab-org/maintainers/database
 /lib/gitlab/github_import/ @gitlab-org/maintainers/database
 /app/finders/ @gitlab-org/maintainers/database
@@ -185,7 +188,6 @@
 /.gitlab/ci/ @gl-quality/eng-prod
 /.gitlab/ci/docs.gitlab-ci.yml @gl-quality/eng-prod @gl-docsteam
 /.gitlab/ci/releases.gitlab-ci.yml @gl-quality/eng-prod @gitlab-org/delivery
-/.gitlab/ci/dast.gitlab-ci.yml @dappelt @ngeorge1 @gl-quality/eng-prod
 /.gitlab/ci/reports.gitlab-ci.yml @gitlab-com/gl-security/appsec @gl-quality/eng-prod
 /.gitlab/CODEOWNERS @gl-quality/eng-prod
 Dangerfile @gl-quality/eng-prod
@@ -198,6 +200,8 @@ Dangerfile @gl-quality/eng-prod
 
 [Backend Static Code Analysis]
 .rubocop*.yml @dstull @splattael @gl-quality/eng-prod
+.rubocop_todo.yml @dstull @splattael @gl-quality/eng-prod
+.rubocop_todo/ @dstull @splattael @gl-quality/eng-prod
 /rubocop/ @dstull @splattael @gl-quality/eng-prod
 /spec/rubocop/ @dstull @splattael @gl-quality/eng-prod
 
@@ -230,8 +234,6 @@ Dangerfile @gl-quality/eng-prod
 /ee/app/policies/vulnerability*.rb @gitlab-org/secure/threat-insights-backend-team
 /ee/app/presenters/projects/security/ @gitlab-org/secure/threat-insights-backend-team
 /ee/lib/api/vulnerabilit*.rb @gitlab-org/secure/threat-insights-backend-team
-/ee/lib/gitlab/ci/reports/security/vulnerability_reports_comparer.rb @gitlab-org/secure/threat-insights-backend-team
-/ee/spec/lib/gitlab/ci/reports/security/vulnerability_reports_comparer_spec.rb @gitlab-org/secure/threat-insights-backend-team
 /ee/spec/policies/vulnerabilities/ @gitlab-org/secure/threat-insights-backend-team
 /ee/spec/policies/vulnerability*.rb @gitlab-org/secure/threat-insights-backend-team
 /ee/spec/presenters/projects/security/ @gitlab-org/secure/threat-insights-backend-team
@@ -267,8 +269,6 @@ Dangerfile @gl-quality/eng-prod
 /spec/lib/gitlab/kubernetes/network_policy_spec.rb @gitlab-org/protect/container-security-backend
 /ee/app/services/network_policies/** @gitlab-org/protect/container-security-backend
 /ee/spec/services/network_policies/** @gitlab-org/protect/container-security-backend
-/ee/app/controllers/projects/security/waf_anomalies_controller.rb @gitlab-org/protect/container-security-backend
-/ee/spec/controllers/projects/security/waf_anomalies_controller_spec.rb @gitlab-org/protect/container-security-backend
 /app/models/clusters/applications/cilium.rb @gitlab-org/protect/container-security-backend
 /spec/models/clusters/applications/cilium_spec.rb @gitlab-org/protect/container-security-backend
 /ee/app/controllers/projects/security/network_policies_controller.rb @gitlab-org/protect/container-security-backend
@@ -298,7 +298,7 @@ Dangerfile @gl-quality/eng-prod
 /lib/gitlab/discussions_diff/ @dskim_gitlab @garyh @patrickbajao @marc_shaw @kerrizor
 /lib/gitlab/quick_actions/ @dskim_gitlab @garyh @patrickbajao @marc_shaw @kerrizor
 
-/ee/app/models/merge_request.rb @dskim_gitlab @garyh @patrickbajao @marc_shaw @kerrizor
+/ee/app/models/ee/merge_request.rb @dskim_gitlab @garyh @patrickbajao @marc_shaw @kerrizor
 /ee/app/services/merge_requests/ @dskim_gitlab @garyh @patrickbajao @marc_shaw @kerrizor
 /ee/app/workers/merge_requests/ @dskim_gitlab @garyh @patrickbajao @marc_shaw @kerrizor
 /ee/app/workers/merge_request_reset_approvals_worker.rb @dskim_gitlab @garyh @patrickbajao @marc_shaw @kerrizor
@@ -306,7 +306,6 @@ Dangerfile @gl-quality/eng-prod
 /app/assets/javascripts/diffs @viktomas @jboyson @iamphill @thomasrandolph
 /app/assets/javascripts/batch_comments/ @viktomas @jboyson @iamphill @thomasrandolph
 /app/assets/javascripts/notes @viktomas @jboyson @iamphill @thomasrandolph
-/app/assets/javascripts/merge_request @viktomas @jboyson @iamphill @thomasrandolph
 /app/assets/javascripts/merge_conflicts @viktomas @jboyson @iamphill @thomasrandolph
 /app/assets/javascripts/mr_notes @viktomas @jboyson @iamphill @thomasrandolph
 /app/assets/javascripts/mr_popover @viktomas @jboyson @iamphill @thomasrandolph
@@ -328,7 +327,6 @@ Dangerfile @gl-quality/eng-prod
 /lib/gitlab/usage_data_counters/ @gitlab-org/growth/product-intelligence/engineers
 
 [Growth Experiments]
-/app/assets/javascripts/lib/utils/experimentation.js @gitlab-org/growth/experiment-devs
 /app/experiments/ @gitlab-org/growth/experiment-devs
 /app/models/experiment.rb @gitlab-org/growth/experiment-devs
 /app/models/experiment_subject.rb @gitlab-org/growth/experiment-devs