summaryrefslogtreecommitdiff
path: root/lib/gitlab/usage_data.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-18 06:06:20 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-18 06:06:20 +0000
commit44baf08d4ff4b0d32fecfded843257e2fc49a63c (patch)
treeac056e38e6b3daf04cd69f539a767eefb9a00144 /lib/gitlab/usage_data.rb
parentc1f270b8ba4602952c36ce042e5eae439b22f9a6 (diff)
downloadgitlab-ce-44baf08d4ff4b0d32fecfded843257e2fc49a63c.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/usage_data.rb')
-rw-r--r--lib/gitlab/usage_data.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/gitlab/usage_data.rb b/lib/gitlab/usage_data.rb
index 02afd42d9d3..b6effac25c6 100644
--- a/lib/gitlab/usage_data.rb
+++ b/lib/gitlab/usage_data.rb
@@ -135,7 +135,8 @@ module Gitlab
prometheus_metrics_enabled: Gitlab::Metrics.prometheus_metrics_enabled?,
reply_by_email_enabled: Gitlab::IncomingEmail.enabled?,
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