Thibaut Girka 3e686beaea Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/routes.rb Upstream changed some admin routes, conflict was because of an added :show action for statuses on our side. Kept it.		2018-12-23 11:28:28 +01: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
active_model_serializers.rb
application_controller_renderer.rb
assets.rb
backtrace_silencers.rb
blacklists.rb
chewy.rb
content_security_policy.rb	Remove form_action from CSP	2018-12-14 08:02:06 +01: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
doorkeeper.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-22 17:51:38 +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	lint pass 2 (#8878)	2018-10-04 17:38:04 +02:00
open_uri_redirection.rb	rubocop issues - Cleaning up (#8912)	2018-10-08 04:50:11 +02:00
pagination.rb
paperclip.rb
premailer_rails.rb
rack_attack.rb	lint pass 2 (#8878)	2018-10-04 17:38:04 +02:00
rack_attack_logging.rb
redis.rb
session_activations.rb
session_store.rb
sidekiq.rb	lint pass 2 (#8878)	2018-10-04 17:38:04 +02:00
simple_form.rb
single_user_mode.rb
statsd.rb
stoplight.rb
strong_migrations.rb
suppress_csrf_warnings.rb
trusted_proxies.rb
twitter_regex.rb	Lint pass (#8876)	2018-10-04 12:36:53 +02:00
vapid.rb	Lint pass (#8876)	2018-10-04 12:36:53 +02:00
wrap_parameters.rb