Thibaut Girka 1b0ff4cd69 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/settings/notifications_controller.rb - app/javascript/packs/public.js - app/views/settings/preferences/show.html.haml - app/views/stream_entries/_simple_status.html.haml - config/locales/simple_form.en.yml - config/locales/simple_form.pl.yml - config/navigation.rb - config/routes.rb		2019-06-10 18:59:53 +02:00
..
0_post_deployment_migrations.rb	…
1_hosts.rb	…
active_model_serializers.rb	Remove unused ActivityPub `@context` values depending on response (#10378)	2019-03-27 15:55:23 +01:00
application_controller_renderer.rb	…
assets.rb	…
backtrace_silencers.rb	…
blacklists.rb	…
chewy.rb	…
content_security_policy.rb	Fix CSP when PAPERCLIP_ROOT_URL is set to a different host	2019-05-04 10:55:56 +02:00
cookies_serializer.rb	…
cors.rb	…
delivery_job.rb	…
devise.rb	…
doorkeeper.rb	…
fast_blank.rb	…
ffmpeg.rb	…
filter_parameter_logging.rb	…
http_client_proxy.rb	…
httplog.rb	…
inflections.rb	…
instrumentation.rb	…
json_ld.rb	…
kaminari_config.rb	…
locale.rb	…
mime_types.rb	…
oj.rb	…
omniauth.rb	…
open_uri_redirection.rb	…
pagination.rb	…
paperclip.rb	…
premailer_rails.rb	…
rack_attack.rb	Fix undefined method error (#10868)	2019-05-28 15:31:51 +03:00
rack_attack_logging.rb	Bump rack-attack from 5.4.2 to 6.0.0 (#10599)	2019-05-03 16:16:11 +02:00
redis.rb	…
session_activations.rb	…
session_store.rb	…
sidekiq.rb	…
simple_form.rb	Change preferences page into appearance, notifications, and other (#10977)	2019-06-07 03:39:24 +02:00
single_user_mode.rb	…
statsd.rb	…
stoplight.rb	Fix stoplight logging to stderr separate from Rails logger (#10624)	2019-04-23 04:39:48 +02:00
strong_migrations.rb	…
suppress_csrf_warnings.rb	…
trusted_proxies.rb	…
twitter_regex.rb	…
vapid.rb	…
wrap_parameters.rb	…