0aa69487a2
Conflicts: - `app/models/concerns/user/has_settings.rb`: Not a real conflict, upstream added a setting textually close to a glitch-soc one. Added upstream's new setting. - `app/views/settings/preferences/appearance/show.html.haml`: Not a real conflict, upstream added a setting textually close to a glitch-soc one. Added upstream's new setting. - `config/routes.rb`: Upstream moved web app routes to `config/routes/web_app.rb`, while glitch-soc had an extra route. Moved the extra route to `config/routes/web_app.rb`. - `spec/controllers/settings/preferences/appearance_controller_spec.rb`: This spec got converted to a system spec upstream. However, the theme setting works differently in glitch-soc, so the spec had been changed. Changed the corresponding system spec as well. |
||
|---|---|---|
| .. | ||
| activitypub | ||
| api | ||
| auth/sessions | ||
| oauth | ||
| settings | ||
| statuses | ||
| well_known | ||
| account_show_page_spec.rb | ||
| accounts_spec.rb | ||
| anonymous_cookies_spec.rb | ||
| backups_spec.rb | ||
| cache_spec.rb | ||
| catch_all_route_request_spec.rb | ||
| content_security_policy_spec.rb | ||
| custom_css_spec.rb | ||
| disabled_oauth_endpoints_spec.rb | ||
| emojis_spec.rb | ||
| filters_spec.rb | ||
| follower_accounts_spec.rb | ||
| following_accounts_spec.rb | ||
| health_spec.rb | ||
| instance_actor_spec.rb | ||
| invite_spec.rb | ||
| invites_spec.rb | ||
| link_headers_spec.rb | ||
| localization_spec.rb | ||
| log_out_spec.rb | ||
| mail_subscriptions_spec.rb | ||
| manifest_spec.rb | ||
| media_proxy_spec.rb | ||
| media_spec.rb | ||
| omniauth_callbacks_spec.rb | ||
| remote_interaction_helper_spec.rb | ||
| self_destruct_spec.rb | ||
| severed_relationships_spec.rb | ||
| signature_verification_spec.rb | ||
| tags_spec.rb | ||