From: Thibaut Girka <thib@sitedethib.com>
Date: Mon, 3 Feb 2020 08:22:58 +0000 (+0100)
Subject: Merge branch 'master' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=369201a425f7b539290815402a4bc65923911e11;p=mastodon.git

Merge branch 'master' into glitch-soc/merge-upstream
---

369201a425f7b539290815402a4bc65923911e11
diff --cc app/models/account.rb
index b856d1c76,0eb719d65..e46888415
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@@ -81,11 -77,10 +81,10 @@@ class Account < ApplicationRecor
  
    # Local user validations
    validates :username, format: { with: /\A[a-z0-9_]+\z/i }, length: { maximum: 30 }, if: -> { local? && will_save_change_to_username? && actor_type != 'Application' }
-   validates_with UniqueUsernameValidator, 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, note_length: { maximum: 500 }, if: -> { local? && will_save_change_to_note? }
 -  validates :fields, length: { maximum: 4 }, if: -> { local? && will_save_change_to_fields? }
 +  validates :display_name, length: { maximum: MAX_DISPLAY_NAME_LENGTH }, if: -> { local? && will_save_change_to_display_name? }
 +  validates :note, note_length: { maximum: MAX_NOTE_LENGTH }, if: -> { local? && will_save_change_to_note? }
 +  validates :fields, length: { maximum: MAX_FIELDS }, if: -> { local? && will_save_change_to_fields? }
  
    scope :remote, -> { where.not(domain: nil) }
    scope :local, -> { where(domain: nil) }