diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-22 09:08:09 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-22 09:08:09 +0000 |
| commit | 4a3ba3e5f261eb09e6b2b4fd44373e7a1c454a72 (patch) | |
| tree | 1a94467252ebcc5575c7de6a3590360ce05b9967 /app/models/application_setting_implementation.rb | |
| parent | 707c0eca50cf9a5290806ce637be30f4c7288def (diff) | |
| download | gitlab-ce-4a3ba3e5f261eb09e6b2b4fd44373e7a1c454a72.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/application_setting_implementation.rb')
| -rw-r--r-- | app/models/application_setting_implementation.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/models/application_setting_implementation.rb b/app/models/application_setting_implementation.rb index 221e4d5e0c6..69292fd11fb 100644 --- a/app/models/application_setting_implementation.rb +++ b/app/models/application_setting_implementation.rb @@ -115,6 +115,8 @@ module ApplicationSettingImplementation sourcegraph_enabled: false, sourcegraph_url: nil, sourcegraph_public_only: true, + spam_check_endpoint_enabled: false, + spam_check_endpoint_url: nil, minimum_password_length: DEFAULT_MINIMUM_PASSWORD_LENGTH, namespace_storage_size_limit: 0, terminal_max_session_time: 0, @@ -151,7 +153,7 @@ module ApplicationSettingImplementation snowplow_app_id: nil, snowplow_iglu_registry_url: nil, custom_http_clone_url_root: nil, - productivity_analytics_start_date: Time.now, + productivity_analytics_start_date: Time.current, snippet_size_limit: 50.megabytes } end |