mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-23 16:44:04 -05:00
f09f5b35f2
Conflicts: - `app/models/account.rb`: Upstream refactored this file a bit, moving validation limits to constants. We already had a similar change, although with different constant names. Updated to match upstream's code. The following files were also modified accordingly: - `app/views/settings/profiles/show.html.haml` - `spec/requests/api/v1/accounts/credentials_spec.rb` |
||
---|---|---|
.. | ||
aliases | ||
applications | ||
deletes | ||
exports | ||
featured_tags | ||
flavours | ||
imports | ||
login_activities | ||
migration/redirects | ||
migrations | ||
preferences | ||
privacy | ||
profiles | ||
shared | ||
two_factor_authentication | ||
two_factor_authentication_methods | ||
verifications |