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

[rails.git] / config / settings.yml

diff --git a/config/settings.yml b/config/settings.yml
index e2ff88a419effdabc6f4a09bb7947b8d1d53ed5f..c79199145163359dd3a7efbc6dcb6e539c4037e1 100644 (file)
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -63,12 +63,13 @@ max_messages_per_hour: 60
 default_message_query_limit: 100
 # Maximum number of messages returned by inbox and outbox message api
 max_message_query_limit: 100
 default_message_query_limit: 100
 # Maximum number of messages returned by inbox and outbox message api
 max_message_query_limit: 100

-# Rate limit for friending
-max_friends_per_hour: 60
+# Rate limit for following
+max_follows_per_hour: 60

 # Rate limit for changeset comments
 min_changeset_comments_per_hour: 1
 initial_changeset_comments_per_hour: 6
 max_changeset_comments_per_hour: 60
 # Rate limit for changeset comments
 min_changeset_comments_per_hour: 1
 initial_changeset_comments_per_hour: 6
 max_changeset_comments_per_hour: 60

+comments_to_max_changeset_comments: 200

 moderator_changeset_comments_per_hour: 36000
 # Rate limit for changes
 min_changes_per_hour: 100
 moderator_changeset_comments_per_hour: 36000
 # Rate limit for changes
 min_changes_per_hour: 100


@@ -106,8 +107,6 @@ attachments_dir: ":rails_root/public/attachments"
 #logstash_path: ""
 # List of memcache servers to use for caching
 #memcache_servers: []
 #logstash_path: ""
 # List of memcache servers to use for caching
 #memcache_servers: []

-# Enable HTTP basic authentication support
-basic_auth_support: true

 # URL of Nominatim instance to use for geocoding
 nominatim_url: "https://nominatim.openstreetmap.org/"
 # Default editor
 # URL of Nominatim instance to use for geocoding
 nominatim_url: "https://nominatim.openstreetmap.org/"
 # Default editor