mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-18 04:43: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. |
||
---|---|---|
.. | ||
accounts | ||
admin | ||
announcements | ||
emails | ||
featured_tags | ||
instances | ||
lists | ||
polls | ||
push | ||
statuses | ||
timelines | ||
trends | ||
accounts_controller_spec.rb | ||
announcements_controller_spec.rb | ||
blocks_controller_spec.rb | ||
bookmarks_controller_spec.rb | ||
conversations_controller_spec.rb | ||
custom_emojis_controller_spec.rb | ||
directories_controller_spec.rb | ||
endorsements_controller_spec.rb | ||
favourites_controller_spec.rb | ||
filters_controller_spec.rb | ||
followed_tags_controller_spec.rb | ||
instances_controller_spec.rb | ||
markers_controller_spec.rb | ||
media_controller_spec.rb | ||
mutes_controller_spec.rb | ||
notifications_controller_spec.rb | ||
polls_controller_spec.rb | ||
preferences_controller_spec.rb | ||
reports_controller_spec.rb | ||
scheduled_statuses_controller_spec.rb | ||
statuses_controller_spec.rb | ||
streaming_controller_spec.rb |