summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2017-05-12 19:16:40 +0000
committerRobert Speicher <robert@gitlab.com>2017-05-12 19:16:40 +0000
commitb012c0b3164e58b55c9860ea6874b76491669a40 (patch)
tree85732fd1be1a1d233c2582a52676bc7f2dbcf630 /config
parent2d83e4c5d15cdfd8da71be6ee0d5746b8ec9ef99 (diff)
parentf0b3ed91bc87117194578cfc5f58849886b5a97d (diff)
downloadgitlab-ce-b012c0b3164e58b55c9860ea6874b76491669a40.tar.gz
Merge branch 'disable-usage-ping' into 'master'
Usage ping updates Closes #31741 and #31453 See merge request !11231
Diffstat (limited to 'config')
-rw-r--r--config/initializers/1_settings.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 6097ae6534e..ea1815f500a 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -241,6 +241,7 @@ Settings.gitlab['domain_whitelist'] ||= []
Settings.gitlab['import_sources'] ||= %w[github bitbucket gitlab google_code fogbugz git gitlab_project gitea]
Settings.gitlab['trusted_proxies'] ||= []
Settings.gitlab['no_todos_messages'] ||= YAML.load_file(Rails.root.join('config', 'no_todos_messages.yml'))
+Settings.gitlab['usage_ping_enabled'] = true if Settings.gitlab['usage_ping_enabled'].nil?
#
# CI