Thibaut Girka ddd875ad99 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/media_attachment.rb Upstream added audio attachment support - app/serializers/initial_state_serializer.rb Upstream added audio attachment support and how mimetypes are returned - app/serializers/rest/instance_serializer.rb Upstream added a few fields - config/application.rb Upstream added a different paperclip transcoder		2019-06-24 15:02:59 +02:00
..
0_post_deployment_migrations.rb	Add post-deployment migration system (#8182)	2018-08-13 18:17:20 +02:00
1_hosts.rb	Set Content-Security-Policy rules through RoR's config (#8957)	2018-10-11 20:35:46 +02:00
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	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	Disable Same-Site cookie implementation to fix SSO issues on WebKit browsers (#9819)	2019-01-15 23:11:46 +01: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
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	Preload common JSON-LD contexts (#9412)	2018-12-02 16:46:13 +01: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	Add timeouts for S3 (#9842)	2019-01-18 01:36:59 +01:00
premailer_rails.rb
rack_attack.rb	Fix undefined method error (#10868)	2019-05-28 15:31:51 +03: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	Fix that Rails.cache information could not be sent via StatsD (#8831)	2018-09-30 00:05:59 +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