f5b7307890
Conflicts: - `.rubocop_todo.yml`: Took upstream's version of the conflicting lines. |
||
|---|---|---|
| .. | ||
| activitypub | ||
| admin | ||
| api | ||
| auth | ||
| concerns | ||
| disputes | ||
| filters | ||
| oauth | ||
| settings | ||
| .rubocop.yml | ||
| about_controller_spec.rb | ||
| application_controller_spec.rb | ||
| authorize_interactions_controller_spec.rb | ||
| custom_css_controller_spec.rb | ||
| emojis_controller_spec.rb | ||
| filters_controller_spec.rb | ||
| follower_accounts_controller_spec.rb | ||
| following_accounts_controller_spec.rb | ||
| health_controller_spec.rb | ||
| home_controller_spec.rb | ||
| instance_actors_controller_spec.rb | ||
| intents_controller_spec.rb | ||
| invites_controller_spec.rb | ||
| manifests_controller_spec.rb | ||
| media_controller_spec.rb | ||
| media_proxy_controller_spec.rb | ||
| privacy_controller_spec.rb | ||
| relationships_controller_spec.rb | ||
| shares_controller_spec.rb | ||
| statuses_cleanup_controller_spec.rb | ||
| statuses_controller_spec.rb | ||
| tags_controller_spec.rb | ||