Merge remote-tracking branch 'upstream/pull/4747'

[rails.git] / config / settings.yml

diff --git a/config/settings.yml b/config/settings.yml
index 87c467c88301b11970ea43e365134f58f153bb0a..c057be978a841485174d6714ea3499744011fd2e 100644 (file)
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -45,6 +45,8 @@ default_note_query_limit: 100
 max_note_query_limit: 10000
 # Maximum value of open issues counter for moderators, anything equal or greater to this value "n" is shown as "n+"
 max_issues_count: 99
+# Maximum number of points in a GPX trace
+max_trace_size: 1000000
 # Zoom level to use for postcode results from the geocoder
 postcode_zoom: 15
 # Timeout for API calls in seconds
@@ -53,6 +55,8 @@ api_timeout: 300
 web_timeout: 30
 # Periods (in hours) which are allowed for user blocks
 user_block_periods: [0, 1, 3, 6, 12, 24, 48, 96, 168, 336, 731, 4383, 8766, 87660]
+# Account deletion cooldown period (in hours) since last changeset close; null to disable, 0 to make sure there aren't any open changesets when the deletion happens
+user_account_deletion_delay: null
 # Rate limit for message sending
 max_messages_per_hour: 60
 # Rate limit for friending
@@ -95,6 +99,7 @@ attachments_dir: ":rails_root/public/attachments"
 basic_auth_support: true
 # Enable legacy OAuth 1.0 support
 oauth_10_support: true
+oauth_10_registration: true
 # URL of Nominatim instance to use for geocoding
 nominatim_url: "https://nominatim.openstreetmap.org/"
 # Default editor