Commit 21a251e8 authored by Sean McGivern's avatar Sean McGivern

Move usage_ping_enabled into common params

parent 0bc39485
...@@ -148,6 +148,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController ...@@ -148,6 +148,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
:version_check_enabled, :version_check_enabled,
:terminal_max_session_time, :terminal_max_session_time,
:polling_interval_multiplier, :polling_interval_multiplier,
:usage_ping_enabled,
disabled_oauth_sign_in_sources: [], disabled_oauth_sign_in_sources: [],
import_sources: [], import_sources: [],
...@@ -169,7 +170,6 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController ...@@ -169,7 +170,6 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
:elasticsearch_search, :elasticsearch_search,
:repository_size_limit, :repository_size_limit,
:shared_runners_minutes, :shared_runners_minutes,
:usage_ping_enabled,
:minimum_mirror_sync_time, :minimum_mirror_sync_time,
:geo_status_timeout, :geo_status_timeout,
:elasticsearch_experimental_indexer, :elasticsearch_experimental_indexer,
......
...@@ -257,7 +257,8 @@ class ApplicationSetting < ActiveRecord::Base ...@@ -257,7 +257,8 @@ class ApplicationSetting < ActiveRecord::Base
terminal_max_session_time: 0, terminal_max_session_time: 0,
two_factor_grace_period: 48, two_factor_grace_period: 48,
user_default_external: false, user_default_external: false,
polling_interval_multiplier: 1 polling_interval_multiplier: 1,
usage_ping_enabled: true
} }
end end
...@@ -266,7 +267,6 @@ class ApplicationSetting < ActiveRecord::Base ...@@ -266,7 +267,6 @@ class ApplicationSetting < ActiveRecord::Base
elasticsearch_url: ENV['ELASTIC_URL'] || 'http://localhost:9200', elasticsearch_url: ENV['ELASTIC_URL'] || 'http://localhost:9200',
elasticsearch_aws: false, elasticsearch_aws: false,
elasticsearch_aws_region: ENV['ELASTIC_REGION'] || 'us-east-1', elasticsearch_aws_region: ENV['ELASTIC_REGION'] || 'us-east-1',
usage_ping_enabled: true,
minimum_mirror_sync_time: Gitlab::Mirror::FIFTEEN, minimum_mirror_sync_time: Gitlab::Mirror::FIFTEEN,
repository_size_limit: 0 repository_size_limit: 0
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment