tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
984fce613e51bee54a12e2d42dda5018a870df24
Mastodon/config/initializers
History
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
…
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
…
delivery_job.rb
…
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
…
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
…
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
…
open_uri_redirection.rb
…
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_logging.rb
…
rack_attack.rb
Change rate limit for media proxy (#11814)
2019-09-13 16:02:52 +02:00
redis.rb
…
session_activations.rb
…
session_store.rb
…
sidekiq.rb
…
simple_form.rb
…
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
…
strong_migrations.rb
…
suppress_csrf_warnings.rb
…
trusted_proxies.rb
…
twitter_regex.rb
…
vapid.rb
…
wrap_parameters.rb
…