about summary refs log tree commit diff
path: root/app/models/account.rb
diff options
context:
space:
mode:
authorkibigo! <marrus-sh@users.noreply.github.com>2017-06-25 19:19:52 -0700
committerkibigo! <marrus-sh@users.noreply.github.com>2017-06-25 19:19:52 -0700
commitb323e00bf38f490b6011505df2ff2b4db6b17421 (patch)
treef489b788e67160e985e36c223bddcb19ff607783 /app/models/account.rb
parenta520b118e4653aa35a74eba6e1662dfc98fcd1cc (diff)
parent93fc8aa14c914d03643197306c325becbaed2581 (diff)
Merge branch 'master' of https://github.com/glitch-soc/mastodon
Diffstat (limited to 'app/models/account.rb')
-rw-r--r--app/models/account.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/account.rb b/app/models/account.rb
index 2b54cee5f..14c90cfc0 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -60,7 +60,7 @@ class Account < ApplicationRecord
   validates :username, format: { with: /\A[a-z0-9_]+\z/i }, uniqueness: { scope: :domain, case_sensitive: false }, length: { maximum: 30 }, if: -> { local? && will_save_change_to_username? }
   validates_with UnreservedUsernameValidator, if: -> { local? && will_save_change_to_username? }
   validates :display_name, length: { maximum: 30 }, if: -> { local? && will_save_change_to_display_name? }
-  validates :note, length: { maximum: 160 }, if: -> { local? && will_save_change_to_note? }
+  validates :note, length: { maximum: 500 }, if: -> { local? && will_save_change_to_note? }
 
   # Timelines
   has_many :stream_entries, inverse_of: :account, dependent: :destroy