155dc4bc4b
Conflicts: - `CONTRIBUTING.md`: Upstream changed the file, while we had a different one. Updated the common parts. - `README.md`: Upstream changed the file, while we had a different one. Updated the common parts. - `app/helpers/application_helper.rb`: Upstream added helpers where glitch-soc had extra ones. Added upstream's new helpers. - `app/models/form/admin_settings.rb`: Upstream added some custom handling of one setting, while glitch-soc had additional code. Ported upstream's code. - `lib/mastodon/version.rb`: Upstream moved some things to `config/mastodon.yml`. Did the same. - `spec/requests/api/v1/accounts/credentials_spec.rb`: I don't know honestly. |
||
|---|---|---|
| .. | ||
| 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 | ||
| settings_digests.rb | ||
| sidekiq.rb | ||
| simple_cov_source_file.rb | ||
| simple_form.rb | ||
| single_user_mode.rb | ||
| statistics.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 | ||