This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/config/initializers
Thibaut Girka 61631f4751 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- README.md
- app/javascript/styles/mastodon/components.scss
  conflicts caused by image URLs being different
- app/models/status.rb
  as_home_timeline removed, kept glitch-soc-only as_direct_timeline
- app/views/statuses/_simple_status.html.haml
- config/locales/en.yml
  some strings were changed upstream
- spec/models/status_spec.rb
  as_home_timeline removed, kept glitch-soc-only as_direct_timeline
2019-10-10 17:26:08 +02:00
..
0_post_deployment_migrations.rb
1_hosts.rb Set Content-Security-Policy rules through RoR's config (#8957) 2018-10-11 20:35:46 +02:00
2_whitelist_mode.rb Add whitelist mode (#11291) 2019-07-30 11:10:46 +02:00
active_model_serializers.rb Fix ActivityPub context not being dynamically computed (#11746) 2019-09-03 22:52:32 +02:00
application_controller_renderer.rb
assets.rb
backtrace_silencers.rb
blacklists.rb
chewy.rb Fix records not being indexed sometimes (#12024) 2019-10-01 01:19:11 +02:00
content_security_policy.rb Fix connect-src policy for Tesseract 2019-08-19 22:02:35 +02:00
cookies_serializer.rb
cors.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-12-15 10:45:53 +01:00
delivery_job.rb Skip mailer job retries when a record no longer exists (#9590) 2018-12-21 06:16:17 +01:00
devise.rb Fix authentication before 2FA challenge (#11943) 2019-09-24 04:35:36 +02:00
doorkeeper.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-06-24 15:02:59 +02:00
fast_blank.rb
ffmpeg.rb add ffmpeg initializer (#8855) 2018-10-09 03:02:52 +02:00
filter_parameter_logging.rb
health_check.rb Hide error message on /heath (#11947) 2019-09-24 20:28:25 +02:00
http_client_proxy.rb lint pass 2 (#8878) 2018-10-04 17:38:04 +02:00
httplog.rb
inflections.rb Add a nodeinfo endpoint (#12002) 2019-09-29 21:31:51 +02:00
json_ld.rb Fix preloaded JSON-LD context for identity not being used (#12138) 2019-10-10 06:48:53 +02:00
kaminari_config.rb
locale.rb
mime_types.rb
oj.rb
omniauth.rb cas_options :validate_url should be :service_validate_url (#10328) 2019-03-21 04:06:41 +01:00
open_uri_redirection.rb rubocop issues - Cleaning up (#8912) 2018-10-08 04:50:11 +02:00
pagination.rb
paperclip.rb Fix attachment not being re-downloaded even if file is not stored (#12125) 2019-10-09 07:10:46 +02:00
premailer_rails.rb
rack_attack.rb Change rate limit for media proxy (#11814) 2019-09-13 16:02:52 +02:00
rack_attack_logging.rb Bump rack-attack from 5.4.2 to 6.0.0 (#10599) 2019-05-03 16:16:11 +02:00
redis.rb
session_activations.rb
session_store.rb Disable Same-Site cookie implementation to fix SSO issues on WebKit browsers (#9819) 2019-01-15 23:11:46 +01:00
sidekiq.rb lint pass 2 (#8878) 2018-10-04 17:38:04 +02:00
simple_form.rb Change preferences page into appearance, notifications, and other (#10977) 2019-06-07 03:39:24 +02:00
single_user_mode.rb
statsd.rb Remove unused StatsD code and expose StatsD as a global variable (#11232) 2019-07-02 11:34:39 +02:00
stoplight.rb Fix stoplight logging to stderr separate from Rails logger (#10624) 2019-04-23 04:39:48 +02:00
strong_migrations.rb
suppress_csrf_warnings.rb
trusted_proxies.rb
twitter_regex.rb Fix URL linkifier grabbing full-width spaces and quotations (#9997) 2019-02-09 20:13:11 +01:00
vapid.rb Lint pass (#8876) 2018-10-04 12:36:53 +02:00
wrap_parameters.rb