4113fbf6e8
Conflicts: - `lib/sanitize_ext/sanitize_config.rb`: Upstream enforced new code style rules, where we had different code. Applied the new code style rules. |
||
|---|---|---|
| .. | ||
| accounts | ||
| admin | ||
| announcements | ||
| featured_tags | ||
| instances | ||
| polls | ||
| push | ||
| statuses | ||
| timelines | ||
| trends | ||
| accounts_controller_spec.rb | ||
| announcements_controller_spec.rb | ||
| conversations_controller_spec.rb | ||
| custom_emojis_controller_spec.rb | ||
| directories_controller_spec.rb | ||
| endorsements_controller_spec.rb | ||
| filters_controller_spec.rb | ||
| instances_controller_spec.rb | ||
| markers_controller_spec.rb | ||
| preferences_controller_spec.rb | ||
| scheduled_statuses_controller_spec.rb | ||
| statuses_controller_spec.rb | ||
| streaming_controller_spec.rb | ||