diff options
| author | Sean McGivern <sean@gitlab.com> | 2017-04-05 13:19:59 +0100 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-04-14 15:20:55 +0200 |
| commit | ebd5e9b4549ebc80155a5a8f139efdb40b6f8b12 (patch) | |
| tree | 84d7f3066f0dbf7022bc0ec58cb3ab235006715a /app/controllers | |
| parent | c3bb21ff800699bed829a30c75fa81fd0d4dab8d (diff) | |
| download | gitlab-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/controllers')
| -rw-r--r-- | app/controllers/admin/application_settings_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb index 515d8e1523b..82b01be5a11 100644 --- a/app/controllers/admin/application_settings_controller.rb +++ b/app/controllers/admin/application_settings_controller.rb @@ -135,6 +135,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController :version_check_enabled, :terminal_max_session_time, :polling_interval_multiplier, + :usage_ping_enabled, disabled_oauth_sign_in_sources: [], import_sources: [], |