Thibaut Girka c91d9b7389 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/lib/user_settings_decorator.rb app/models/user.rb app/serializers/initial_state_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.en.yml config/locales/simple_form.ja.yml config/locales/simple_form.pl.yml config/routes.rb		2018-10-01 12:43:20 +02:00
..
0_post_deployment_migrations.rb	Add post-deployment migration system (#8182)	2018-08-13 18:17:20 +02:00
1_hosts.rb	Tighten CSP while allowing CDN hosts	2018-08-23 22:58:40 +02:00
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	2018-09-03 22:37:54 +02:00
cookies_serializer.rb
cors.rb
devise.rb	feat(cookies): Use the same-site attribute to lax (#8626)	2018-09-08 23:54:28 +02:00
doorkeeper.rb	Introduce OAuth scopes for bookmarks	2018-08-10 16:49:06 +02:00
fast_blank.rb
filter_parameter_logging.rb
http_client_proxy.rb	Merge HIDDEN_SERVICE_VIA_TRANSPARENT_PROXY into ALLOW_ACCESS_TO_HIDDEN_SERVICE (#7901)	2018-06-29 15:36:02 +02:00
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)	2018-08-25 13:27:08 +02:00
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)	2018-09-08 23:54:28 +02:00
sidekiq.rb
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
trusted_proxies.rb
twitter_regex.rb	Misc. typos (#8694)	2018-09-14 00:53:09 +02:00
vapid.rb
wrap_parameters.rb