Thibaut Girka 65e994b29b Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/directories_controller.rb - app/controllers/settings/applications_controller.rb - app/controllers/settings/base_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/exports_controller.rb - app/controllers/settings/follower_domains_controller.rb - app/controllers/settings/imports_controller.rb - app/controllers/settings/migrations_controller.rb - app/controllers/settings/notifications_controller.rb - app/controllers/settings/preferences_controller.rb - app/controllers/settings/sessions_controller.rb - app/controllers/settings/two_factor_authentication/confirmations_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb - app/controllers/settings/two_factor_authentications_controller.rb Conflicts were due to some refactoring already made in glitch-soc when introducing flavours.		2018-12-15 10:45:53 +01: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
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
devise.rb	feat(cookies): Use the same-site attribute to lax (#8626)	2018-09-08 23:54:28 +02:00
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	Rename S3_CLOUDFRONT_HOST to S3_ALIAS_HOST. (#8423)	2018-08-25 13:27:08 +02:00
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	feat(cookies): Use the same-site attribute to lax (#8626)	2018-09-08 23:54:28 +02:00
sidekiq.rb	lint pass 2 (#8878)	2018-10-04 17:38:04 +02:00
simple_form.rb	Redesign forms, verify link ownership with rel="me" (#8703)	2018-09-18 16:45:58 +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
strong_migrations.rb
suppress_csrf_warnings.rb	Suppress CSRF token warnings (#6240)	2018-01-15 06:51:23 +01:00
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