Commit ff8e2564 authored by Heinrich Lee Yu's avatar Heinrich Lee Yu

Merge branch '32358-add-modsec-feature-flag-to-usage-ping' into 'master'

Add ingress_modsecurity feature flag to usage ping

Closes #32358

See merge request gitlab-org/gitlab!20194
parents 4fa37849 8f1c9225
---
title: Add modsecurity feature flag to usage ping
merge_request: 20194
author:
type: added
...@@ -135,7 +135,8 @@ module Gitlab ...@@ -135,7 +135,8 @@ module Gitlab
prometheus_metrics_enabled: Gitlab::Metrics.prometheus_metrics_enabled?, prometheus_metrics_enabled: Gitlab::Metrics.prometheus_metrics_enabled?,
reply_by_email_enabled: Gitlab::IncomingEmail.enabled?, reply_by_email_enabled: Gitlab::IncomingEmail.enabled?,
signup_enabled: Gitlab::CurrentSettings.allow_signup?, signup_enabled: Gitlab::CurrentSettings.allow_signup?,
web_ide_clientside_preview_enabled: Gitlab::CurrentSettings.web_ide_clientside_preview_enabled? web_ide_clientside_preview_enabled: Gitlab::CurrentSettings.web_ide_clientside_preview_enabled?,
ingress_modsecurity_enabled: Feature.enabled?(:ingress_modsecurity)
} }
end end
......
...@@ -85,6 +85,7 @@ describe Gitlab::UsageData do ...@@ -85,6 +85,7 @@ describe Gitlab::UsageData do
influxdb_metrics_enabled influxdb_metrics_enabled
prometheus_metrics_enabled prometheus_metrics_enabled
web_ide_clientside_preview_enabled web_ide_clientside_preview_enabled
ingress_modsecurity_enabled
)) ))
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment