Add latest changes from gitlab-org/gitlab@master

8 files changed, 46 insertions, 9 deletions

diff --git a/config/feature_flags/development/highlight_js_worker.yml b/config/feature_flags/development/highlight_js_worker.yml
deleted file mode 100644
index 7086ace38e6..00000000000
--- a/config/feature_flags/development/highlight_js_worker.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: highlight_js_worker
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/124276
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/415755
-milestone: '16.2'
-type: development
-group: group::source code
-default_enabled: true
diff --git a/config/feature_flags/gitlab_com_derisk/ci_text_interpolation.yml b/config/feature_flags/gitlab_com_derisk/ci_text_interpolation.yml
new file mode 100644
index 00000000000..32dd15e16b0
--- /dev/null
+++ b/config/feature_flags/gitlab_com_derisk/ci_text_interpolation.yml
@@ -0,0 +1,9 @@
+---
+name: ci_text_interpolation
+feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/433002
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/142009
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/435177
+milestone: '16.9'
+group: group::pipeline authoring
+type: gitlab_com_derisk
+default_enabled: false
diff --git a/config/feature_flags/gitlab_com_derisk/external_pipeline_validation_migration.yml b/config/feature_flags/gitlab_com_derisk/external_pipeline_validation_migration.yml
new file mode 100644
index 00000000000..0efc2e1c160
--- /dev/null
+++ b/config/feature_flags/gitlab_com_derisk/external_pipeline_validation_migration.yml
@@ -0,0 +1,9 @@
+---
+name: external_pipeline_validation_migration
+feature_issue_url: https://gitlab.com/gitlab-com/gl-infra/platform/runway/team/-/issues/135
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/142077
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/438627
+milestone: '16.9'
+group: group::scalability
+type: gitlab_com_derisk
+default_enabled: false
diff --git a/config/feature_flags/ops/log_large_in_list_queries.yml b/config/feature_flags/ops/log_large_in_list_queries.yml
new file mode 100644
index 00000000000..c4e500e7192
--- /dev/null
+++ b/config/feature_flags/ops/log_large_in_list_queries.yml
@@ -0,0 +1,9 @@
+---
+name: log_large_in_list_queries
+feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/434581
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/141150
+rollout_issue_url: https://gitlab.com/gitlab-com/gl-infra/production/-/issues/17359
+milestone: '16.9'
+group: group::database
+type: ops
+default_enabled: false
diff --git a/config/feature_flags/wip/deployment_details_page.yml b/config/feature_flags/wip/deployment_details_page.yml
new file mode 100644
index 00000000000..ac6fc050ff7
--- /dev/null
+++ b/config/feature_flags/wip/deployment_details_page.yml
@@ -0,0 +1,8 @@
+---
+name: deployment_details_page
+introduced_by_url: 'https://gitlab.com/gitlab-org/gitlab/-/merge_requests/141808'
+rollout_issue_url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/438327'
+milestone: '16.9'
+type: wip
+group: group::environments
+default_enabled: false
diff --git a/config/feature_flags/wip/gcp_runner.yml b/config/feature_flags/wip/gcp_runner.yml
new file mode 100644
index 00000000000..e98b2508b1e
--- /dev/null
+++ b/config/feature_flags/wip/gcp_runner.yml
@@ -0,0 +1,9 @@
+---
+name: gcp_runner
+feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/437901
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/141521
+rollout_issue_url:
+milestone: '16.9'
+group: group::runner
+type: wip
+default_enabled: false
diff --git a/config/initializers/database_query_analyzers.rb b/config/initializers/database_query_analyzers.rb
index 9facd822e5c..d5910d13e0a 100644
--- a/config/initializers/database_query_analyzers.rb
+++ b/config/initializers/database_query_analyzers.rb
@@ -8,6 +8,7 @@ Gitlab::Database::QueryAnalyzer.instance.tap do |query_analyzer|
     analyzers.append(::Gitlab::Database::QueryAnalyzers::GitlabSchemasMetrics)
     analyzers.append(::Gitlab::Database::QueryAnalyzers::PreventCrossDatabaseModification)
     analyzers.append(::Gitlab::Database::QueryAnalyzers::Ci::PartitioningRoutingAnalyzer)
+    analyzers.append(::Gitlab::Database::QueryAnalyzers::LogLargeInLists)
 
     if Gitlab.dev_or_test_env?
       analyzers.append(::Gitlab::Database::QueryAnalyzers::GitlabSchemasValidateConnection)
diff --git a/config/routes/project.rb b/config/routes/project.rb
index 6c77bf64755..23733bbe821 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -334,7 +334,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
             get :search
           end
 
-          resources :deployments, only: [:index] do
+          resources :deployments, only: [:index, :show] do
             member do
               get :metrics
               get :additional_metrics