fe5f6bc7ed
Conflicts: - `.github/workflows/build-image.yml`: Fix erroneous deletion in a previous merge. - `Gemfile`: Conflict caused by glitch-soc-only hCaptcha dependency - `app/controllers/auth/sessions_controller.rb`: Minor conflict due to glitch-soc's theming system. - `app/controllers/filters_controller.rb`: Minor conflict due to glitch-soc's theming system. - `app/serializers/rest/status_serializer.rb`: Minor conflict due to glitch-soc having an extra `local_only` property |
||
|---|---|---|
| .. | ||
| activitypub | ||
| admin | ||
| api | ||
| auth | ||
| concerns | ||
| disputes | ||
| 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 | ||
| 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 | ||
| 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 | ||