diff options
Diffstat (limited to 'app/models/application_setting_implementation.rb')
| -rw-r--r-- | app/models/application_setting_implementation.rb | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/app/models/application_setting_implementation.rb b/app/models/application_setting_implementation.rb index 73554ee8457..8bdb80a65b1 100644 --- a/app/models/application_setting_implementation.rb +++ b/app/models/application_setting_implementation.rb @@ -37,8 +37,8 @@ module ApplicationSettingImplementation { after_sign_up_text: nil, akismet_enabled: false, - allow_local_requests_from_web_hooks_and_services: false, allow_local_requests_from_system_hooks: true, + allow_local_requests_from_web_hooks_and_services: false, asset_proxy_enabled: false, authorized_keys_enabled: true, # TODO default to false if the instance is configured to use AuthorizedKeysCommand commit_email_hostname: default_commit_email_hostname, @@ -47,10 +47,11 @@ module ApplicationSettingImplementation container_registry_token_expire_delay: 5, container_registry_vendor: '', container_registry_version: '', + custom_http_clone_url_root: nil, default_artifacts_expire_in: '30 days', + default_branch_name: nil, default_branch_protection: Settings.gitlab['default_branch_protection'], default_ci_config_path: nil, - default_branch_name: nil, default_group_visibility: Settings.gitlab.default_projects_features['visibility_level'], default_project_creation: Settings.gitlab['default_project_creation'], default_project_visibility: Settings.gitlab.default_projects_features['visibility_level'], @@ -63,9 +64,9 @@ module ApplicationSettingImplementation dsa_key_restriction: 0, ecdsa_key_restriction: 0, ed25519_key_restriction: 0, - eks_integration_enabled: false, - eks_account_id: nil, eks_access_key_id: nil, + eks_account_id: nil, + eks_integration_enabled: false, eks_secret_access_key: nil, email_restrictions_enabled: false, email_restrictions: nil, @@ -74,6 +75,9 @@ module ApplicationSettingImplementation gitaly_timeout_fast: 10, gitaly_timeout_medium: 30, gravatar_enabled: Settings.gravatar['enabled'], + group_download_export_limit: 1, + group_export_limit: 6, + group_import_limit: 6, help_page_hide_commercial_content: false, help_page_text: nil, hide_third_party_offers: false, @@ -83,46 +87,57 @@ module ApplicationSettingImplementation housekeeping_gc_period: 200, housekeeping_incremental_repack_period: 10, import_sources: Settings.gitlab['import_sources'], + instance_statistics_visibility_private: false, issues_create_limit: 300, local_markdown_version: 0, + login_recaptcha_protection_enabled: false, max_artifacts_size: Settings.artifacts['max_size'], max_attachment_size: Settings.gitlab['max_attachment_size'], max_import_size: 50, + minimum_password_length: DEFAULT_MINIMUM_PASSWORD_LENGTH, mirror_available: true, notify_on_unknown_sign_in: true, outbound_local_requests_whitelist: [], password_authentication_enabled_for_git: true, password_authentication_enabled_for_web: Settings.gitlab['signin_enabled'], performance_bar_allowed_group_id: nil, - rsa_key_restriction: 0, plantuml_enabled: false, plantuml_url: nil, polling_interval_multiplier: 1, + productivity_analytics_start_date: Time.current, + project_download_export_limit: 1, project_export_enabled: true, + project_export_limit: 6, + project_import_limit: 6, protected_ci_variables: true, - push_event_hooks_limit: 3, + protected_paths: DEFAULT_PROTECTED_PATHS, push_event_activities_limit: 3, + push_event_hooks_limit: 3, raw_blob_request_limit: 300, recaptcha_enabled: false, - login_recaptcha_protection_enabled: false, repository_checks_enabled: true, - repository_storages: ['default'], repository_storages_weighted: { default: 100 }, + repository_storages: ['default'], require_two_factor_authentication: false, restricted_visibility_levels: Settings.gitlab['restricted_visibility_levels'], - session_expire_delay: Settings.gitlab['session_expire_delay'], + rsa_key_restriction: 0, send_user_confirmation_email: false, + session_expire_delay: Settings.gitlab['session_expire_delay'], shared_runners_enabled: Settings.gitlab_ci['shared_runners_enabled'], shared_runners_text: nil, sign_in_text: nil, signup_enabled: Settings.gitlab['signup_enabled'], + snippet_size_limit: 50.megabytes, + snowplow_app_id: nil, + snowplow_collector_hostname: nil, + snowplow_cookie_domain: nil, + snowplow_enabled: false, + snowplow_iglu_registry_url: nil, sourcegraph_enabled: false, - sourcegraph_url: nil, sourcegraph_public_only: true, + sourcegraph_url: nil, 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, throttle_authenticated_api_enabled: false, throttle_authenticated_api_period_in_seconds: 3600, @@ -130,41 +145,26 @@ module ApplicationSettingImplementation throttle_authenticated_web_enabled: false, throttle_authenticated_web_period_in_seconds: 3600, throttle_authenticated_web_requests_per_period: 7200, - throttle_unauthenticated_enabled: false, - throttle_unauthenticated_period_in_seconds: 3600, - throttle_unauthenticated_requests_per_period: 3600, + throttle_incident_management_notification_enabled: false, + throttle_incident_management_notification_per_period: 3600, + throttle_incident_management_notification_period_in_seconds: 3600, throttle_protected_paths_enabled: false, throttle_protected_paths_in_seconds: 10, throttle_protected_paths_per_period: 60, - protected_paths: DEFAULT_PROTECTED_PATHS, - throttle_incident_management_notification_enabled: false, - throttle_incident_management_notification_period_in_seconds: 3600, - throttle_incident_management_notification_per_period: 3600, + throttle_unauthenticated_enabled: false, + throttle_unauthenticated_period_in_seconds: 3600, + throttle_unauthenticated_requests_per_period: 3600, time_tracking_limit_to_hours: false, two_factor_grace_period: 48, unique_ips_limit_enabled: false, unique_ips_limit_per_user: 10, unique_ips_limit_time_window: 3600, usage_ping_enabled: Settings.gitlab['usage_ping_enabled'], - instance_statistics_visibility_private: false, + usage_stats_set_by_user_id: nil, user_default_external: false, user_default_internal_regex: nil, user_show_add_ssh_key_message: true, - usage_stats_set_by_user_id: nil, - snowplow_collector_hostname: nil, - snowplow_cookie_domain: nil, - snowplow_enabled: false, - snowplow_app_id: nil, - snowplow_iglu_registry_url: nil, - custom_http_clone_url_root: nil, - productivity_analytics_start_date: Time.current, - snippet_size_limit: 50.megabytes, - project_import_limit: 6, - project_export_limit: 6, - project_download_export_limit: 1, - group_import_limit: 6, - group_export_limit: 6, - group_download_export_limit: 1 + wiki_page_max_content_bytes: 50.megabytes } end |