Add latest changes from gitlab-org/gitlab@master

8 files changed, 59 insertions, 14 deletions

diff --git a/config/application.rb b/config/application.rb
index 9d8d285b6bc..e7bea556960 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -320,6 +320,7 @@ module Gitlab
     config.assets.precompile << "page_bundles/prometheus.css"
     config.assets.precompile << "page_bundles/promotions.css"
     config.assets.precompile << "page_bundles/releases.css"
+    config.assets.precompile << "page_bundles/remote_development.css"
     config.assets.precompile << "page_bundles/reports.css"
     config.assets.precompile << "page_bundles/roadmap.css"
     config.assets.precompile << "page_bundles/requirements.css"
diff --git a/config/circuitbox.rb b/config/circuitbox.rb
deleted file mode 100644
index edce0aefdb8..00000000000
--- a/config/circuitbox.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-Circuitbox.configure do |config|
-  config.default_circuit_store = Circuitbox::MemoryStore.new
-  config.default_notifier = GitLab::CircuitBreaker::Notifier.new
-end
diff --git a/config/feature_flags/development/draft_quick_action_non_toggle.yml b/config/feature_flags/development/draft_quick_action_non_toggle.yml
deleted file mode 100644
index 4d28b61f3bf..00000000000
--- a/config/feature_flags/development/draft_quick_action_non_toggle.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: draft_quick_action_non_toggle
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/92654
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/368610
-milestone: '15.4'
-type: development
-group: group::code review
-default_enabled: false
diff --git a/config/initializers/circuitbox.rb b/config/initializers/circuitbox.rb
new file mode 100644
index 00000000000..966320265aa
--- /dev/null
+++ b/config/initializers/circuitbox.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+Gitlab.ee do
+  Circuitbox.configure do |config|
+    config.default_circuit_store = Gitlab::CircuitBreaker::Store.new
+    config.default_notifier = Gitlab::CircuitBreaker::Notifier.new
+  end
+end
diff --git a/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml
index cb112a9e078..aa50145225e 100755
--- a/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml
@@ -57,6 +57,7 @@ options:
   - p_ci_templates_security_api_fuzzing
   - p_ci_templates_security_dast
   - p_ci_templates_security_api_discovery
+  - p_ci_templates_security_bas_latest
   - p_ci_templates_ios_fastlane
   - p_ci_templates_composer
   - p_ci_templates_c
diff --git a/config/metrics/counts_28d/20230509140528_p_ci_templates_security_bas_latest_monthly.yml b/config/metrics/counts_28d/20230509140528_p_ci_templates_security_bas_latest_monthly.yml
new file mode 100644
index 00000000000..b1ebcac1427
--- /dev/null
+++ b/config/metrics/counts_28d/20230509140528_p_ci_templates_security_bas_latest_monthly.yml
@@ -0,0 +1,24 @@
+---
+key_path: redis_hll_counters.ci_templates.p_ci_templates_security_bas_latest_monthly
+description: Count of pipelines using the latest Breach and Attack Simulation template
+product_section: sec
+product_stage: secure
+product_group: dynamic_analysis
+value_type: number
+status: active
+milestone: "16.0"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/119981
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+options:
+  events:
+  - p_ci_templates_security_bas_latest
diff --git a/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml
index f8c07beae1d..64ef9858a64 100755
--- a/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml
@@ -57,6 +57,7 @@ options:
   - p_ci_templates_security_api_fuzzing
   - p_ci_templates_security_dast
   - p_ci_templates_security_api_discovery
+  - p_ci_templates_security_bas_latest
   - p_ci_templates_ios_fastlane
   - p_ci_templates_composer
   - p_ci_templates_c
diff --git a/config/metrics/counts_7d/20230509140526_p_ci_templates_security_bas_latest_weekly.yml b/config/metrics/counts_7d/20230509140526_p_ci_templates_security_bas_latest_weekly.yml
new file mode 100644
index 00000000000..fe44c289e94
--- /dev/null
+++ b/config/metrics/counts_7d/20230509140526_p_ci_templates_security_bas_latest_weekly.yml
@@ -0,0 +1,24 @@
+---
+key_path: redis_hll_counters.ci_templates.p_ci_templates_security_bas_latest_weekly
+description: Count of pipelines using the latest Breach and Attack Simulation template
+product_section: sec
+product_stage: secure
+product_group: dynamic_analysis
+value_type: number
+status: active
+milestone: "16.0"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/119981
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+options:
+  events:
+  - p_ci_templates_security_bas_latest