summaryrefslogtreecommitdiff
path: root/app/models/application_setting.rb
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2017-04-05 13:19:59 +0100
committerRémy Coutable <remy@rymai.me>2017-04-14 15:20:55 +0200
commitebd5e9b4549ebc80155a5a8f139efdb40b6f8b12 (patch)
tree84d7f3066f0dbf7022bc0ec58cb3ab235006715a /app/models/application_setting.rb
parentc3bb21ff800699bed829a30c75fa81fd0d4dab8d (diff)
downloadgitlab-ce-ebd5e9b4549ebc80155a5a8f139efdb40b6f8b12.tar.gz
Port 'Add EE usage ping' to CE
CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/557
Diffstat (limited to 'app/models/application_setting.rb')
-rw-r--r--app/models/application_setting.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb
index 2961e16f5e0..dd1a6922968 100644
--- a/app/models/application_setting.rb
+++ b/app/models/application_setting.rb
@@ -238,7 +238,8 @@ class ApplicationSetting < ActiveRecord::Base
terminal_max_session_time: 0,
two_factor_grace_period: 48,
user_default_external: false,
- polling_interval_multiplier: 1
+ polling_interval_multiplier: 1,
+ usage_ping_enabled: true
}
end