Add user account deletion delay setting

diff --git a/config/initializers/config.rb b/config/initializers/config.rb
index c1cc522a5e13b24eef5b2bae373c512d403b82f6..f36e6ac1ac4f0686dc401f928c552fe1695478b4 100644 (file)
--- a/config/initializers/config.rb
+++ b/config/initializers/config.rb
@@ -79,6 +79,7 @@ Config.setup do |config|
     required(:max_number_of_relation_members).filled(:int?)
     required(:max_issues_count).filled(:int?)
     required(:api_timeout).filled(:int?)
     required(:max_number_of_relation_members).filled(:int?)
     required(:max_issues_count).filled(:int?)
     required(:api_timeout).filled(:int?)

+    required(:user_account_deletion_delay).maybe(:number?)

     required(:imagery_blacklist).maybe(:array?)
     required(:status).filled(:str?, :included_in? => ALLOWED_STATUS)
     required(:avatar_storage).filled(:str?)
     required(:imagery_blacklist).maybe(:array?)
     required(:status).filled(:str?, :included_in? => ALLOWED_STATUS)
     required(:avatar_storage).filled(:str?)

diff --git a/config/settings.yml b/config/settings.yml
index 87c467c88301b11970ea43e365134f58f153bb0a..1c9c7e0a1123481543d2f2950b733fee71f5aeac 100644 (file)
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -53,6 +53,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]
 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
 # Rate limit for message sending
 max_messages_per_hour: 60
 # Rate limit for friending