mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-16 20:03:24 +00:00
178e151019
Conflicts: - `app/models/user_settings.rb`: Upstream added a constraint on a setting textually close to glitch-soc-only settings. Applied upstream's change. - `lib/sanitize_ext/sanitize_config.rb`: Upstream added support for the `translate` attribute on a few elements, where glitch-soc had a different set of allowed elements and attributes. Extended glitch-soc's allowed attributes with `translate` as upstream did. - `spec/validators/status_length_validator_spec.rb`: Upstream refactored to use RSpec's `instance_double` instead of `double`, but glitch-soc had changes to tests due to configurable max toot chars. Applied upstream's changes while keeping tests against configurable max toot chars. |
||
|---|---|---|
| .. | ||
| disputes | ||
| reports | ||
| settings | ||
| trends | ||
| users | ||
| webhooks | ||
| account_actions_controller.rb | ||
| account_moderation_notes_controller.rb | ||
| accounts_controller.rb | ||
| action_logs_controller.rb | ||
| announcements_controller.rb | ||
| base_controller.rb | ||
| change_emails_controller.rb | ||
| confirmations_controller.rb | ||
| custom_emojis_controller.rb | ||
| dashboard_controller.rb | ||
| domain_allows_controller.rb | ||
| domain_blocks_controller.rb | ||
| email_domain_blocks_controller.rb | ||
| export_domain_allows_controller.rb | ||
| export_domain_blocks_controller.rb | ||
| follow_recommendations_controller.rb | ||
| instances_controller.rb | ||
| invites_controller.rb | ||
| ip_blocks_controller.rb | ||
| relationships_controller.rb | ||
| relays_controller.rb | ||
| report_notes_controller.rb | ||
| reports_controller.rb | ||
| resets_controller.rb | ||
| roles_controller.rb | ||
| rules_controller.rb | ||
| settings_controller.rb | ||
| site_uploads_controller.rb | ||
| statuses_controller.rb | ||
| tags_controller.rb | ||
| warning_presets_controller.rb | ||
| webhooks_controller.rb | ||