This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

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	…
application_controller_renderer.rb	…
assets.rb	…
backtrace_silencers.rb	…
blacklists.rb	…
chewy.rb	…
content_security_policy.rb	…
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	…
rack_attack_logging.rb	…
redis.rb	…
session_activations.rb	…
session_store.rb	…
sidekiq.rb	…
simple_form.rb	…
single_user_mode.rb	…
statsd.rb	…
stoplight.rb	…
strong_migrations.rb	…
suppress_csrf_warnings.rb	…
trusted_proxies.rb	…
twitter_regex.rb	…
vapid.rb	…
wrap_parameters.rb	…