diff options
| author | Sean McGivern <sean@gitlab.com> | 2017-05-09 20:40:19 +0100 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2017-05-11 09:20:11 +0100 |
| commit | 3c546acf78408087b5062be67ae6b05650e0f27e (patch) | |
| tree | 0ac538aa9b0786dbac0317693dafa47cf8d01012 /config | |
| parent | 4067dd4f84681dd109fb8e1957b6327b4db20193 (diff) | |
| download | gitlab-ce-3c546acf78408087b5062be67ae6b05650e0f27e.tar.gz | |
Allow disabling usage ping in `gitlab.yml`
Setting `usage_ping_enabled` to false in `gitlab.yml`:
1. Disables the usage ping, regardless of the value stored in the database.
2. Prevents the usage ping from being enabled through the admin panel. It can
only be enabled by either removing the line from `gitlab.yml` and configuring
through the admin panel, or setting it to true in `gitlab.yml`.
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/1_settings.rb | 1 |
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 |