Thibaut Girka d392020da6 Merge branch 'master' into glitch-soc/tentative-merge ... Conflicts: README.md app/controllers/statuses_controller.rb app/lib/feed_manager.rb config/navigation.rb spec/lib/feed_manager_spec.rb Conflicts were resolved by taking both versions for each change. This means the two filter systems (glitch-soc's keyword mutes and tootsuite's custom filters) are in place, which will be changed in a follow-up commit.		2018-07-09 07:13:59 +02:00
..
active_model_serializers.rb	Disable AMS logging (#7623)	2018-05-26 01:08:31 +02:00
application_controller_renderer.rb
assets.rb
backtrace_silencers.rb
blacklists.rb
chewy.rb
content_security_policy.rb
cookies_serializer.rb
cors.rb
devise.rb
doorkeeper.rb	Add more granular OAuth scopes (#7929)	2018-07-05 18:31:35 +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
ostatus.rb
pagination.rb
paperclip.rb	Improve OpenStack v3 compatibility (#7392)	2018-05-07 02:28:28 +02:00
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	Add dat, dweb, ipfs, ipns, ssb, gopher protocols to URL extractor (#7810)	2018-06-15 20:21:47 +02:00
vapid.rb
wrap_parameters.rb