Add latest changes from gitlab-org/gitlab@master

11 files changed, 75 insertions, 12 deletions

diff --git a/config/feature_flags/development/anthropic_experimentation.yml b/config/feature_flags/development/anthropic_experimentation.yml
new file mode 100644
index 00000000000..8d4f2200532
--- /dev/null
+++ b/config/feature_flags/development/anthropic_experimentation.yml
@@ -0,0 +1,8 @@
+---
+name: anthropic_experimentation
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/119729
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/409939
+milestone: '16.0'
+type: development
+group: group::ai-enablement
+default_enabled: false
diff --git a/config/feature_flags/development/application_settings_tokens_optional_encryption.yml b/config/feature_flags/development/application_settings_tokens_optional_encryption.yml
deleted file mode 100644
index c3619dbe2d0..00000000000
--- a/config/feature_flags/development/application_settings_tokens_optional_encryption.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: application_settings_tokens_optional_encryption
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/25532
-rollout_issue_url: 
-milestone: '11.9'
-type: development
-group: group::runner
-default_enabled: false
diff --git a/config/feature_flags/development/expose_authorized_cluster_agents.yml b/config/feature_flags/development/expose_authorized_cluster_agents.yml
index 9110c2be6c6..b5a44d5d309 100644
--- a/config/feature_flags/development/expose_authorized_cluster_agents.yml
+++ b/config/feature_flags/development/expose_authorized_cluster_agents.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/407841
 milestone: '16.0'
 type: development
 group: group::environments
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/groups_tokens_optional_encryption.yml b/config/feature_flags/development/groups_tokens_optional_encryption.yml
index c34cae689c2..4f67ea4bd6c 100644
--- a/config/feature_flags/development/groups_tokens_optional_encryption.yml
+++ b/config/feature_flags/development/groups_tokens_optional_encryption.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/333862
 milestone: '11.9'
 type: development
 group: group::runner
-default_enabled: true
+default_enabled: false
diff --git a/config/feature_flags/development/packages_display_last_pipeline.yml b/config/feature_flags/development/packages_display_last_pipeline.yml
new file mode 100644
index 00000000000..a90edb4bb86
--- /dev/null
+++ b/config/feature_flags/development/packages_display_last_pipeline.yml
@@ -0,0 +1,8 @@
+---
+name: packages_display_last_pipeline
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/120125
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/410362
+milestone: '16.0'
+type: development
+group: group::package registry
+default_enabled: false
diff --git a/config/feature_flags/development/projects_tokens_optional_encryption.yml b/config/feature_flags/development/projects_tokens_optional_encryption.yml
index 6a0fed009ea..c35becd87ab 100644
--- a/config/feature_flags/development/projects_tokens_optional_encryption.yml
+++ b/config/feature_flags/development/projects_tokens_optional_encryption.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/333864
 milestone: '11.9'
 type: development
 group: group::runner
-default_enabled: true
+default_enabled: false
diff --git a/config/feature_flags/development/realtime_approvals.yml b/config/feature_flags/development/realtime_approvals.yml
new file mode 100644
index 00000000000..b2a4131b0f6
--- /dev/null
+++ b/config/feature_flags/development/realtime_approvals.yml
@@ -0,0 +1,8 @@
+---
+name: realtime_approvals
+introduced_by_url: 'https://gitlab.com/gitlab-org/gitlab/-/merge_requests/114963'
+rollout_issue_url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/399539'
+milestone: '16.0'
+type: development
+group: group::code review
+default_enabled: false
diff --git a/config/metrics/counts_7d/20230509085219_i_quickactions_blocked_by_weekly.yml b/config/metrics/counts_7d/20230509085219_i_quickactions_blocked_by_weekly.yml
new file mode 100644
index 00000000000..d4406527dbd
--- /dev/null
+++ b/config/metrics/counts_7d/20230509085219_i_quickactions_blocked_by_weekly.yml
@@ -0,0 +1,23 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_blocked_by_weekly
+name: quickactions_blocked_by_weekly
+description: Count of MAU using the `/blocked_by` quick action
+product_section: dev
+product_stage: plan
+product_group: product_planning
+value_type: number
+status: active
+milestone: "16.0"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/120006
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_blocked_by
+performance_indicator_type: []
+distribution:
+- ee
+tier:
+- starter
diff --git a/config/metrics/counts_7d/20230509090906_i_quickactions_blocks_weekly.yml b/config/metrics/counts_7d/20230509090906_i_quickactions_blocks_weekly.yml
new file mode 100644
index 00000000000..3d5b8ed6ce2
--- /dev/null
+++ b/config/metrics/counts_7d/20230509090906_i_quickactions_blocks_weekly.yml
@@ -0,0 +1,23 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_blocks_weekly
+name: quickactions_blocks_weekly
+description: Count of MAU using the `/blocks` quick action
+product_section: dev
+product_stage: plan
+product_group: product_planning
+value_type: number
+status: active
+milestone: "16.0"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/120006
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_blocks
+performance_indicator_type: []
+distribution:
+- ee
+tier:
+- starter
diff --git a/config/routes.rb b/config/routes.rb
index 9a5fb2df4c5..9c8ad8fe047 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -168,7 +168,6 @@ InitializerConnections.raise_if_new_database_connection do
         draw :country
         draw :country_state
         draw :subscription
-        draw :llm
 
         scope '/push_from_secondary/:geo_node_id' do
           draw :git_http
diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml
index 50511d35c0a..0d138c58ff2 100644
--- a/config/sidekiq_queues.yml
+++ b/config/sidekiq_queues.yml
@@ -539,6 +539,8 @@
   - 1
 - - snippets_update_repository_storage
   - 1
+- - ssh_keys_update_last_used_at
+  - 1
 - - status_page_publish
   - 1
 - - sync_seat_link_request