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

diff --git a/app/models/user_block.rb b/app/models/user_block.rb
index 9dd8d3138cefb11c887255371f01ec7b9bc2e939..61235c418d079a34944aff3c4f0de93ae5e1b121 100644 (file)
--- a/app/models/user_block.rb
+++ b/app/models/user_block.rb
@@ -28,7 +28,7 @@
 
 class UserBlock < ApplicationRecord
   validate :moderator_permissions
-  validates :reason, :characters => true
+  validates :reason, :characters => true, :length => { :maximum => 10000 }
   validates :deactivates_at, :comparison => { :greater_than_or_equal_to => :ends_at }, :unless => -> { needs_view }
   validates :deactivates_at, :absence => true, :if => -> { needs_view }