mastodon

History

Claire 0aa69487a2 Merge commit '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-soc/merge-upstream 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.		2024-12-25 18:01:37 +01:00
..
0_post_deployment_migrations.rb	…
1_hosts.rb	…
2_limited_federation_mode.rb	…
3_omniauth.rb	Add support for PKCE Extension in OmniAuth OIDC (#31131 )	2024-08-12 14:32:52 +00:00
active_model_serializers.rb	…
active_record_encryption.rb	Change Active Record Encryption variable check to check for emptiness (#32537 )	2024-10-16 08:43:45 +00:00
allowed_private_addresses.rb	Move `ALLOWED_PRIVATE_ADDRESSES` parsing to an initializer (#32850 )	2024-11-12 13:00:52 +00:00
application_controller_renderer.rb	Add empty line after ✨magic✨ frozen string comment (#29696 )	2024-03-21 14:12:50 +00:00
backtrace_silencers.rb	Fix `Style/StringLiterals` cop (#30005 )	2024-04-19 20:33:00 +00:00
cache_buster.rb	…
cache_logging.rb	…
chewy.rb	…
content_security_policy.rb	Change form-action Content-Security-Policy directive to be more restrictive (#26897 )	2024-09-12 13:24:19 +00:00
cookies_serializer.rb	…
cors.rb	Add userinfo oauth endpoint (#32548 )	2024-10-30 14:38:10 +00:00
devise.rb	Enable Style/IfUnlessModifier RuboCop (#30260 )	2024-05-13 09:54:15 +00:00
doorkeeper.rb	Update dependency doorkeeper to v5.8.0 (#33000 )	2024-11-21 13:48:30 +00:00
email_domains_lists.rb	Finish email allow/deny list naming migration (#30530 )	2024-08-13 07:37:32 +00:00
fast_blank.rb	…
ffmpeg.rb	Fixed crash when supplying FFMPEG_BINARY environment variable (#30022 )	2024-04-22 09:00:24 +00:00
filter_parameter_logging.rb	Add `:email` to filter parameter logging config (#30492 )	2024-05-31 09:35:56 +00:00
http_client_proxy.rb	Fix `Style/StringLiterals` cop (#30005 )	2024-04-19 20:33:00 +00:00
httplog.rb	Disable `httplog` gem in production (#32776 )	2024-11-05 08:55:34 +00:00
i18n.rb	Add the Interlingua locale (#30828 )	2024-06-25 14:05:24 +00:00
inflections.rb	Remove unused E2EE messaging code (#31193 )	2024-09-18 09:27:43 +00:00
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	Fix `/health` endpoint when OTEL is configured (#33362 )	2024-12-19 10:44:44 +00:00
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	Rename `PremailerWebpackStrategy` -> `PremailerBundledAssetStrategy` (#29934 )	2024-04-15 09:16:59 +00:00
propshaft.rb	Add material design icons to admin/settings views (#27780 )	2024-04-23 16:43:49 +00:00
rack_attack.rb	Fix incorrect rate limit on PUT requests (#31356 )	2024-08-09 14:48:05 +00:00
rack_attack_logging.rb	Fix rack attack `match_type` value typo in logging config (#30514 )	2024-06-03 07:16:01 +00:00
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	Move `simplecov` config into `rails_helper` (#30302 )	2024-05-15 09:33:36 +00:00
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	Allow @ at the end of an URL (#31124 )	2024-07-25 15:02:58 +00:00
vapid.rb	Change instructions to use `bundle exec rails` instead of `rake` (#30917 )	2024-07-05 08:54:45 +00:00
vips.rb	Add detail about running version on vips error failure (#30858 )	2024-06-27 16:27:42 +00:00
webauthn.rb	Fix `Style/StringLiterals` cop (#30005 )	2024-04-19 20:33:00 +00:00
wrap_parameters.rb	…