Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/controllers/auth/setup_controller.rb`: Upstream removed a method close to a glitch-soc theming-related method. Removed the method like upstream did.
This commit is contained in:
@@ -55,7 +55,7 @@ class AccountFilter
|
||||
when 'by_domain'
|
||||
Account.where(domain: value.to_s.strip)
|
||||
when 'username'
|
||||
Account.matches_username(value.to_s.strip)
|
||||
Account.matches_username(value.to_s.strip.delete_prefix('@'))
|
||||
when 'display_name'
|
||||
Account.matches_display_name(value.to_s.strip)
|
||||
when 'email'
|
||||
|
||||
@@ -18,6 +18,7 @@
|
||||
#
|
||||
|
||||
class PreviewCardProvider < ApplicationRecord
|
||||
include Paginable
|
||||
include DomainNormalizable
|
||||
include Attachmentable
|
||||
|
||||
|
||||
Reference in New Issue
Block a user