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. |
||
|---|---|---|
| .. | ||
| 0_post_deployment_migrations.rb | ||
| 1_hosts.rb | ||
| 2_limited_federation_mode.rb | ||
| 3_omniauth.rb | ||
| active_model_serializers.rb | ||
| active_record_encryption.rb | ||
| allowed_private_addresses.rb | ||
| application_controller_renderer.rb | ||
| backtrace_silencers.rb | ||
| cache_buster.rb | ||
| cache_logging.rb | ||
| chewy.rb | ||
| content_security_policy.rb | ||
| cookies_serializer.rb | ||
| cors.rb | ||
| devise.rb | ||
| doorkeeper.rb | ||
| email_domains_lists.rb | ||
| fast_blank.rb | ||
| ffmpeg.rb | ||
| filter_parameter_logging.rb | ||
| http_client_proxy.rb | ||
| httplog.rb | ||
| i18n.rb | ||
| inflections.rb | ||
| json_ld_identity.rb | ||
| json_ld_security.rb | ||
| kaminari_config.rb | ||
| locale.rb | ||
| mail_delivery_job.rb | ||
| mime_types.rb | ||
| oj.rb | ||
| open_redirects.rb | ||
| open_uri_redirection.rb | ||
| opentelemetry.rb | ||
| paperclip.rb | ||
| permissions_policy.rb | ||
| pghero.rb | ||
| preload_link_headers.rb | ||
| premailer_rails.rb | ||
| propshaft.rb | ||
| rack_attack.rb | ||
| rack_attack_logging.rb | ||
| redis.rb | ||
| session_activations.rb | ||
| session_store.rb | ||
| sidekiq.rb | ||
| simple_cov_source_file.rb | ||
| simple_form.rb | ||
| single_user_mode.rb | ||
| stoplight.rb | ||
| strong_migrations.rb | ||
| suppress_csrf_warnings.rb | ||
| trusted_proxies.rb | ||
| twitter_regex.rb | ||
| vapid.rb | ||
| vips.rb | ||
| webauthn.rb | ||
| wrap_parameters.rb | ||