diff options
| author | Jeremy Jackson <jjackson@gitlab.com> | 2019-08-14 19:21:58 +0000 |
|---|---|---|
| committer | Mayra Cabrera <mcabrera@gitlab.com> | 2019-08-14 19:21:58 +0000 |
| commit | 5d9d5e603119c3ae334b0855a63d10d12b2390bd (patch) | |
| tree | 0fd0becd40de3ecb95ff123e8973dc43b537f25b /app/models | |
| parent | 7f9c653ef4c90a039ede690da1bc9d0524ffcc95 (diff) | |
| download | gitlab-ce-5d9d5e603119c3ae334b0855a63d10d12b2390bd.tar.gz | |
Migrates Snowplow backend from EE to CE
This introduces several changes, but these are all just ported from the
EE project.
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/application_setting.rb | 5 | ||||
| -rw-r--r-- | app/models/application_setting_implementation.rb | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb index cb6346421ec..2a99c6e5c59 100644 --- a/app/models/application_setting.rb +++ b/app/models/application_setting.rb @@ -99,6 +99,11 @@ class ApplicationSetting < ApplicationRecord presence: true, if: :plantuml_enabled + validates :snowplow_collector_hostname, + presence: true, + hostname: true, + if: :snowplow_enabled + validates :max_attachment_size, presence: true, numericality: { only_integer: true, greater_than: 0 } diff --git a/app/models/application_setting_implementation.rb b/app/models/application_setting_implementation.rb index b7a4d7aa803..55ac1e129cf 100644 --- a/app/models/application_setting_implementation.rb +++ b/app/models/application_setting_implementation.rb @@ -97,6 +97,10 @@ module ApplicationSettingImplementation usage_stats_set_by_user_id: nil, diff_max_patch_bytes: Gitlab::Git::Diff::DEFAULT_MAX_PATCH_BYTES, commit_email_hostname: default_commit_email_hostname, + snowplow_collector_hostname: nil, + snowplow_cookie_domain: nil, + snowplow_enabled: false, + snowplow_site_id: nil, protected_ci_variables: false, local_markdown_version: 0, outbound_local_requests_whitelist: [], |