Add latest changes from gitlab-org/gitlab@master

7 files changed, 4 insertions, 36 deletions

diff --git a/config/feature_flags/development/approval_suggestions.yml b/config/feature_flags/development/approval_suggestions.yml
deleted file mode 100644
index 14961d2e248..00000000000
--- a/config/feature_flags/development/approval_suggestions.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: approval_suggestions
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/38992
-rollout_issue_url: 
-milestone: '13.3'
-type: development
-group: group::composition analysis
-default_enabled: true
diff --git a/config/feature_flags/development/changelog_api.yml b/config/feature_flags/development/changelog_api.yml
deleted file mode 100644
index 1c90f05a0ed..00000000000
--- a/config/feature_flags/development/changelog_api.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: changelog_api
-introduced_by_url: '13.9'
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/300043
-milestone: '13.9'
-type: development
-group: group::source code
-default_enabled: false
diff --git a/config/feature_flags/development/gitaly_catfile-cache.yml b/config/feature_flags/development/gitaly_catfile-cache.yml
deleted file mode 100644
index 14268e328f0..00000000000
--- a/config/feature_flags/development/gitaly_catfile-cache.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: gitaly_catfile-cache
-introduced_by_url: 
-rollout_issue_url: 
-milestone: 
-type: development
-group: 
-default_enabled: false
diff --git a/config/feature_flags/development/gitaly_deny_disk_access.yml b/config/feature_flags/development/gitaly_deny_disk_access.yml
deleted file mode 100644
index b9c401e90d4..00000000000
--- a/config/feature_flags/development/gitaly_deny_disk_access.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: gitaly_deny_disk_access
-introduced_by_url: 
-rollout_issue_url: 
-milestone: 
-type: development
-group: 
-default_enabled: false
diff --git a/config/feature_flags/development/pages_serve_with_zip_file_protocol.yml b/config/feature_flags/development/pages_serve_with_zip_file_protocol.yml
index 2ac0cba2bce..836702debba 100644
--- a/config/feature_flags/development/pages_serve_with_zip_file_protocol.yml
+++ b/config/feature_flags/development/pages_serve_with_zip_file_protocol.yml
@@ -1,7 +1,7 @@
 ---
 name: pages_serve_with_zip_file_protocol
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46320
-rollout_issue_url:
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/321677
 milestone: '13.6'
 type: development
 group: group::release
diff --git a/config/feature_flags/development/sort_diffs.yml b/config/feature_flags/development/sort_diffs.yml
index 505b5f0e0b5..49f04c30f49 100644
--- a/config/feature_flags/development/sort_diffs.yml
+++ b/config/feature_flags/development/sort_diffs.yml
@@ -1,8 +1,8 @@
 ---
 name: sort_diffs
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49118
-rollout_issue_url:
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/293819
 milestone: '13.7'
 type: development
 group: group::code review
-default_enabled: false
+default_enabled: true
diff --git a/config/initializers/validate_puma.rb b/config/initializers/validate_puma.rb
index c4516914018..9723765d00f 100644
--- a/config/initializers/validate_puma.rb
+++ b/config/initializers/validate_puma.rb
@@ -4,7 +4,7 @@ def max_puma_workers
   Puma.cli_config.options[:workers].to_i
 end
 
-if Gitlab::Runtime.puma? && max_puma_workers == 0
+if Gitlab::Runtime.puma? && !Gitlab::Runtime.puma_in_clustered_mode?
   raise 'Puma is only supported in Clustered mode (workers > 0)' if Gitlab.com?
 
   warn 'WARNING: Puma is running in Single mode (workers = 0). Some features may not work. Please refer to https://gitlab.com/groups/gitlab-org/-/epics/5303 for info.'