Claire 3465d39494 Merge commit '24ef8255b3f9b44cb54f49bc78fe3382a7070b1a' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/accounts_helper.rb`: Upstream removed a helper, textually adjacent to a glitch-soc-only one. Not really a conflict. Removed the helper as upstream did. - `app/views/layouts/embedded.html.haml`: Conflicts due to theming system. Adapted upstream's change to our theming system. - `app/views/statuses/_simple_status.html.haml`: Removed upstream, but we had local changes. Removed as upstream did.		2024-09-12 20:05:08 +02:00
..
0_duplicate_migrations.rb	…
0_post_deployment_migrations.rb	…
1_hosts.rb	…
2_limited_federation_mode.rb	…
3_omniauth.rb	…
active_model_serializers.rb	…
active_record_encryption.rb	Update rails to version 7.1.4 (#31563)	2024-09-06 15:22:35 +00:00
application_controller_renderer.rb	…
backtrace_silencers.rb	…
cache_buster.rb	…
cache_logging.rb	…
chewy.rb	…
content_security_policy.rb	Change design of embed modal in web UI (#31801)	2024-09-12 12:54:16 +00:00
cookie_rotator.rb	…
cookies_serializer.rb	…
cors.rb	Allow `POST /oauth/revoke` through CORS (#31743)	2024-09-04 10:46:28 +00:00
devise.rb	…
doorkeeper.rb	Finish email allow/deny list naming migration (#30530)	2024-08-13 07:37:32 +00:00
email_domains_lists.rb	Finish email allow/deny list naming migration (#30530)	2024-08-13 07:37:32 +00:00
enable_yjit.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	Use rails configuration storage for paperclip path (#31651)	2024-08-30 09:46:09 +00:00
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	Refactor (ruby) redis configuration (#31694)	2024-09-02 14:19:55 +00:00
simple_cov_source_file.rb	…
simple_form.rb	…
single_user_mode.rb	…
stoplight.rb	Refactor (ruby) redis configuration (#31694)	2024-09-02 14:19:55 +00:00
strong_migrations.rb	…
suppress_csrf_warnings.rb	…
trusted_proxies.rb	…
twitter_regex.rb	…
vapid.rb	…
vips.rb	…
webauthn.rb	…
wrap_parameters.rb	…