You can not 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 91bef4759f Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: Vagrantfile app/javascript/packs/public.js app/views/admin/settings/edit.html.haml app/views/settings/preferences/show.html.haml app/views/settings/profiles/show.html.haml config/locales/es.yml config/locales/simple_form.en.yml config/webpack/configuration.js config/webpack/loaders/babel.js package.json yarn.lock Split new additions to app/javascript/packs/public.js to app/javascript/core/settings.js		6 years ago
..
0_post_deployment_migrations.rb	…
1_hosts.rb	Tighten CSP while allowing CDN hosts	6 years ago
active_model_serializers.rb	…
application_controller_renderer.rb	…
assets.rb	…
backtrace_silencers.rb	…
blacklists.rb	…
chewy.rb	…
content_security_policy.rb	Add manifest_src to CSP	6 years ago
cookies_serializer.rb	…
cors.rb	…
devise.rb	feat(cookies): Use the same-site attribute to lax (#8626)	6 years ago
doorkeeper.rb	…
fast_blank.rb	…
filter_parameter_logging.rb	…
http_client_proxy.rb	…
httplog.rb	…
inflections.rb	…
instrumentation.rb	…
kaminari_config.rb	…
locale.rb	…
mime_types.rb	…
oj.rb	…
omniauth.rb	…
open_uri_redirection.rb	…
pagination.rb	…
paperclip.rb	Rename S3_CLOUDFRONT_HOST to S3_ALIAS_HOST. (#8423)	6 years ago
premailer_rails.rb	…
rack_attack.rb	…
rack_attack_logging.rb	…
redis.rb	…
session_activations.rb	…
session_store.rb	feat(cookies): Use the same-site attribute to lax (#8626)	6 years ago
sidekiq.rb	…
simple_form.rb	Redesign forms, verify link ownership with rel="me" (#8703)	6 years ago
single_user_mode.rb	…
statsd.rb	…
stoplight.rb	…
strong_migrations.rb	…
suppress_csrf_warnings.rb	…
trusted_proxies.rb	…
twitter_regex.rb	Misc. typos (#8694)	6 years ago
vapid.rb	…
wrap_parameters.rb	…