You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		7 years ago
..
0_post_deployment_migrations.rb	Add post-deployment migration system (#8182)	8 years ago
1_hosts.rb	Set Content-Security-Policy rules through RoR's config (#8957)	7 years ago
active_model_serializers.rb	Disable AMS logging (#7623)	8 years ago
application_controller_renderer.rb	…
assets.rb	…
backtrace_silencers.rb	…
blacklists.rb	…
chewy.rb	…
content_security_policy.rb	Remove form_action from CSP	7 years ago
cookies_serializer.rb	…
cors.rb	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
devise.rb	feat(cookies): Use the same-site attribute to lax (#8626)	8 years ago
doorkeeper.rb	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
fast_blank.rb	…
ffmpeg.rb	add ffmpeg initializer (#8855)	7 years ago
filter_parameter_logging.rb	…
http_client_proxy.rb	lint pass 2 (#8878)	7 years ago
httplog.rb	…
inflections.rb	…
instrumentation.rb	…
json_ld.rb	Preload common JSON-LD contexts (#9412)	7 years ago
kaminari_config.rb	…
locale.rb	…
mime_types.rb	…
oj.rb	…
omniauth.rb	lint pass 2 (#8878)	7 years ago
open_uri_redirection.rb	rubocop issues - Cleaning up (#8912)	7 years ago
pagination.rb	…
paperclip.rb	Rename S3_CLOUDFRONT_HOST to S3_ALIAS_HOST. (#8423)	8 years ago
premailer_rails.rb	…
rack_attack.rb	lint pass 2 (#8878)	7 years ago
rack_attack_logging.rb	…
redis.rb	…
session_activations.rb	…
session_store.rb	feat(cookies): Use the same-site attribute to lax (#8626)	8 years ago
sidekiq.rb	lint pass 2 (#8878)	7 years ago
simple_form.rb	Redesign forms, verify link ownership with rel="me" (#8703)	8 years ago
single_user_mode.rb	…
statsd.rb	Fix that Rails.cache information could not be sent via StatsD (#8831)	8 years ago
stoplight.rb	…
strong_migrations.rb	…
suppress_csrf_warnings.rb	…
trusted_proxies.rb	…
twitter_regex.rb	Lint pass (#8876)	7 years ago
vapid.rb	Lint pass (#8876)	7 years ago
wrap_parameters.rb	…