diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-05-12 22:16:40 +0300 |
|---|---|---|
| committer | Timothy Andrew <mail@timothyandrew.net> | 2017-05-19 17:38:39 +0300 |
| commit | b54faeb9527d61a89c999dc77c2af119942110ec (patch) | |
| tree | 6bdc4c1448c7a787738ce7707e4f65082d573981 /app/models | |
| parent | d0b92f929ff71a92877d39ea21335be125f4323f (diff) | |
Merge branch 'disable-usage-ping' into 'master'
Usage ping updates
Closes #31741 and #31453
See merge request !11231
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/application_setting.rb | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb index 54f01f8637e..043f57241a3 100644 --- a/app/models/application_setting.rb +++ b/app/models/application_setting.rb @@ -246,7 +246,7 @@ class ApplicationSetting < ActiveRecord::Base two_factor_grace_period: 48, user_default_external: false, polling_interval_multiplier: 1, - usage_ping_enabled: true + usage_ping_enabled: Settings.gitlab['usage_ping_enabled'] } end @@ -349,6 +349,14 @@ class ApplicationSetting < ActiveRecord::Base sidekiq_throttling_enabled end + def usage_ping_can_be_configured? + Settings.gitlab.usage_ping_enabled + end + + def usage_ping_enabled + usage_ping_can_be_configured? && super + end + private def ensure_uuid! |