mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-18 21:03:27 +00:00
be493b6c0d
Conflicts: - `app/models/account.rb`: Not a real conflict, just upstream getting rid of unused constants too close to glitch-soc-specific contents. Removed unused constants like upstream did. - `app/models/trends.rb`: Conflict because glitch-soc disabled email notifications for trending links. Upstream has refactored this quite a bit and added trending posts. Took upstream code, but disabling the extra trending stuff will come in another commit. - `app/views/admin/trends/links/index.html.haml`: Conflict due to glitch-soc's theming system. Ported upstream changes accordingly. |
||
|---|---|---|
| .. | ||
| blacklisted_email_validator.rb | ||
| disallowed_hashtags_validator.rb | ||
| domain_validator.rb | ||
| ed25519_key_validator.rb | ||
| ed25519_signature_validator.rb | ||
| email_mx_validator.rb | ||
| existing_username_validator.rb | ||
| follow_limit_validator.rb | ||
| html_validator.rb | ||
| import_validator.rb | ||
| note_length_validator.rb | ||
| poll_validator.rb | ||
| reaction_validator.rb | ||
| registration_form_time_validator.rb | ||
| status_length_validator.rb | ||
| status_pin_validator.rb | ||
| unique_username_validator.rb | ||
| unreserved_username_validator.rb | ||
| url_validator.rb | ||
| vote_validator.rb | ||