tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Claire
2023-02-10 13:48:21 +01:00
parent 5e37906083 a9c220242b
commit 4ceadc65b0
37 changed files with 16 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/account_suggestions/setting_source.rb
View File

@ -54,7 +54,7 @@ class AccountSuggestions::SettingSource < AccountSuggestions::Source
next if username.blank?
[username, domain]
[username.downcase, domain&.downcase]
end.compact
end
@ -63,6 +63,6 @@ class AccountSuggestions::SettingSource < AccountSuggestions::Source
end
def to_ordered_list_key(account)
[account.username, account.domain]
[account.username.downcase, account.domain&.downcase]
end
end

2
app/models/form/admin_settings.rb
View File

@ -86,7 +86,7 @@ class Form::AdminSettings
validates :show_domain_blocks_rationale, inclusion: { in: %w(disabled users all) }, if: -> { defined?(@show_domain_blocks_rationale) }
validates :media_cache_retention_period, :content_cache_retention_period, :backups_retention_period, numericality: { only_integer: true }, allow_blank: true, if: -> { defined?(@media_cache_retention_period) || defined?(@content_cache_retention_period) || defined?(@backups_retention_period) }
validates :site_short_description, length: { maximum: 200 }, if: -> { defined?(@site_short_description) }
validates :status_page_url, url: true
validates :status_page_url, url: true, allow_blank: true
validate :validate_site_uploads
KEYS.each do |key|