Thibaut Girka 9adeaf2bfc Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/statuses_controller.rb`: Minor conflict due to theming system		2020-01-24 14:37:06 +01:00
..
0_duplicate_migrations.rb	…
0_post_deployment_migrations.rb	…
1_hosts.rb	…
2_whitelist_mode.rb	…
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	…
content_security_policy.rb	…
cookies_serializer.rb	Upgrade to Rails 5.0.0.1	2016-08-17 17:58:00 +02:00
cors.rb	…
delivery_job.rb	…
devise.rb	✨ Add an LDAP Mail attribute config (#12053)	2019-12-01 18:52:21 +01:00
doorkeeper.rb	Fix resource_owner_from_credentials in Doorkeeper initializer (#12743)	2020-01-03 05:35:46 +01:00
fast_blank.rb	…
ffmpeg.rb	…
filter_parameter_logging.rb	…
health_check.rb	…
http_client_proxy.rb	lint pass 2 (#8878)	2018-10-04 17:38:04 +02:00
httplog.rb	…
inflections.rb	…
json_ld.rb	…
kaminari_config.rb	…
locale.rb	…
mime_types.rb	…
oj.rb	…
omniauth.rb	…
open_uri_redirection.rb	…
pagination.rb	…
paperclip.rb	Fix base64-encoded file uploads not being possible (#12748)	2020-01-04 01:54:07 +01:00
premailer_rails.rb	…
rack_attack.rb	…
rack_attack_logging.rb	…
redis.rb	…
session_activations.rb	…
session_store.rb	…
sidekiq.rb	…
simple_form.rb	Add announcements (#12662)	2020-01-23 22:00:13 +01: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	…
strong_migrations.rb	…
suppress_csrf_warnings.rb	…
trusted_proxies.rb	Fix error	2017-01-22 23:07:31 +01:00
twitter_regex.rb	Add support for magnet: URIs (#12905)	2020-01-23 21:27:26 +01:00
vapid.rb	…
wrap_parameters.rb	…