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

[rails.git] / config / settings.yml

diff --git a/config/settings.yml b/config/settings.yml
index 71819c4020ae9f7c922985101c024294a34d8e5f..2e0346f0031c891d226deeddaa284adb2801cc31 100644 (file)
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -67,8 +67,8 @@ 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
-# 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