Thibaut Girka 33c80e0783 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/media_attachment.rb		2019-05-04 16:37:26 +02:00
..
0_post_deployment_migrations.rb
1_hosts.rb
active_model_serializers.rb	Remove unused ActivityPub @context values depending on response (#10378)	2019-03-27 15:55:23 +01:00
application_controller_renderer.rb
assets.rb
backtrace_silencers.rb
blacklists.rb
chewy.rb
content_security_policy.rb	Fix CSP when PAPERCLIP_ROOT_URL is set to a different host	2019-05-04 10:55:56 +02:00
cookies_serializer.rb
cors.rb
delivery_job.rb
devise.rb
doorkeeper.rb
fast_blank.rb
ffmpeg.rb
filter_parameter_logging.rb
http_client_proxy.rb	lint pass 2 (#8878)	2018-10-04 17:38:04 +02:00
httplog.rb
inflections.rb
instrumentation.rb
json_ld.rb
kaminari_config.rb
locale.rb
mime_types.rb
oj.rb
omniauth.rb
open_uri_redirection.rb
pagination.rb
paperclip.rb
premailer_rails.rb
rack_attack.rb
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	Revocable sessions (#3616)	2017-06-23 18:50:53 +02:00
session_store.rb
sidekiq.rb
simple_form.rb
single_user_mode.rb	Add single user mode	2016-12-06 17:19:26 +01:00
statsd.rb
stoplight.rb
strong_migrations.rb
suppress_csrf_warnings.rb
trusted_proxies.rb
twitter_regex.rb
vapid.rb
wrap_parameters.rb