443ec4f8ba
Conflicts: - `app/views/admin/tags/index.html.haml`: Removed upstream while it had changes in glitch-soc to accomodate for the theming system. Additional changes to accomodate for the theming system: - `app/views/admin/trends/links/preview_card_providers/index.html.haml` - `app/views/admin/trends/links/index.html.haml` - `app/views/admin/trends/tags/index.html.haml` - `app/views/admin/tags/show.html.haml` |
||
|---|---|---|
| .. | ||
| activitypub | ||
| admin | ||
| api | ||
| auth | ||
| concerns | ||
| oauth | ||
| settings | ||
| well_known | ||
| about_controller_spec.rb | ||
| account_follow_controller_spec.rb | ||
| account_unfollow_controller_spec.rb | ||
| accounts_controller_spec.rb | ||
| application_controller_spec.rb | ||
| authorize_interactions_controller_spec.rb | ||
| emojis_controller_spec.rb | ||
| follower_accounts_controller_spec.rb | ||
| following_accounts_controller_spec.rb | ||
| health_controller_spec.rb | ||
| home_controller_spec.rb | ||
| intents_controller_spec.rb | ||
| invites_controller_spec.rb | ||
| manifests_controller_spec.rb | ||
| media_controller_spec.rb | ||
| media_proxy_controller_spec.rb | ||
| relationships_controller_spec.rb | ||
| remote_follow_controller_spec.rb | ||
| remote_interaction_controller_spec.rb | ||
| shares_controller_spec.rb | ||
| statuses_cleanup_controller_spec.rb | ||
| statuses_controller_spec.rb | ||
| tags_controller_spec.rb | ||